From 145d78ddcd5a6ff4c14eeb8cc628e430cb9b46c5 Mon Sep 17 00:00:00 2001
From: Jakob Gillich <jakob@gillich.me>
Date: Sun, 27 Sep 2020 06:32:42 +0200
Subject: [PATCH] Fix quitting causing connection drop screen

---
 .../actors/net/MiddlewareActor.scala          | 34 ++++++++++---------
 .../actors/session/SessionActor.scala         |  9 ++---
 .../game/objectcreate/ObjectClass.scala       |  2 ++
 3 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/main/scala/net/psforever/actors/net/MiddlewareActor.scala b/src/main/scala/net/psforever/actors/net/MiddlewareActor.scala
index 466b04bf..8c1ed25f 100644
--- a/src/main/scala/net/psforever/actors/net/MiddlewareActor.scala
+++ b/src/main/scala/net/psforever/actors/net/MiddlewareActor.scala
@@ -30,13 +30,7 @@ import net.psforever.packet.control.{
   TeardownConnection
 }
 import net.psforever.packet.crypto.{ClientChallengeXchg, ClientFinished, ServerChallengeXchg, ServerFinished}
-import net.psforever.packet.game.{
-  ChangeFireModeMessage,
-  CharacterInfoMessage,
-  KeepAliveMessage,
-  ObjectCreateDetailedMessage,
-  PingMsg
-}
+import net.psforever.packet.game.{ChangeFireModeMessage, CharacterInfoMessage, KeepAliveMessage, PingMsg}
 import scodec.Attempt.{Failure, Successful}
 import scodec.bits.{BitVector, ByteVector, HexStringSyntax}
 import scodec.interop.akka.EnrichedByteVector
@@ -78,6 +72,9 @@ object MiddlewareActor {
   /** Send outgoing packet */
   final case class Send(msg: PlanetSidePacket) extends Command
 
+  /** Teardown connection */
+  final case class Teardown() extends Command
+
   /** Close connection */
   final case class Close() extends Command
 }
@@ -329,15 +326,15 @@ class MiddlewareActor(
 
                 case _ =>
                   log.error(s"Unexpected packet type $packet in cryptoSetup")
-                  stop()
+                  connectionClose()
               }
             case Failure(e) =>
               log.error(s"Could not decode packet in cryptoSetup: ${e}")
-              stop()
+              connectionClose()
           }
         case other =>
           log.error(s"Invalid message '$other' received in cryptoSetup")
-          stop()
+          connectionClose()
       }
       .receiveSignal(onSignal)
   }
@@ -397,15 +394,15 @@ class MiddlewareActor(
 
                 case other =>
                   log.error(s"Unexpected packet '$other' in cryptoFinish")
-                  stop()
+                  connectionClose()
               }
             case Failure(e) =>
               log.error(s"Could not decode packet in cryptoFinish: $e")
-              stop()
+              connectionClose()
           }
         case other =>
           log.error(s"Invalid message '$other' received in cryptoFinish")
-          stop()
+          connectionClose()
       }
       .receiveSignal(onSignal)
   }
@@ -431,11 +428,16 @@ class MiddlewareActor(
           out(packet)
           Behaviors.same
 
+        case Teardown() =>
+          send(TeardownConnection(clientNonce))
+          context.self ! Close()
+          Behaviors.same
+
         case Close() =>
           outQueue
             .dequeueAll(_ => true)
             .foreach(p => send(smp(0, p._2.bytes), Some(nextSequence), crypto))
-          stop()
+          connectionClose()
       }
       .receiveSignal(onSignal)
   }
@@ -505,7 +507,7 @@ class MiddlewareActor(
             Behaviors.stopped
 
           case TeardownConnection(_) =>
-            stop()
+            Behaviors.stopped
 
           case ClientStart(_) =>
             start()
@@ -573,7 +575,7 @@ class MiddlewareActor(
     ByteVector.view(array)
   }
 
-  def stop(): Behavior[Command] = {
+  def connectionClose(): Behavior[Command] = {
     send(ConnectionClose())
     Behaviors.stopped
   }
diff --git a/src/main/scala/net/psforever/actors/session/SessionActor.scala b/src/main/scala/net/psforever/actors/session/SessionActor.scala
index b6373fcd..509a77ea 100644
--- a/src/main/scala/net/psforever/actors/session/SessionActor.scala
+++ b/src/main/scala/net/psforever/actors/session/SessionActor.scala
@@ -9306,17 +9306,14 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
   def KickedByAdministration(): Unit = {
     sendResponse(DisconnectMessage("@kick_w"))
     Thread.sleep(300)
-    // sendResponse(DropSession(session.id, "kick by GM"))
-    middlewareActor ! MiddlewareActor.Close()
+    middlewareActor ! MiddlewareActor.Teardown()
   }
 
   def ImmediateDisconnect(): Unit = {
     if (avatar != null) {
       accountPersistence ! AccountPersistenceService.Logout(avatar.name)
     }
-    // sendResponse(DropCryptoSession())
-    // sendResponse(DropSession(session.id, "user quit"))
-    middlewareActor ! MiddlewareActor.Close()
+    middlewareActor ! MiddlewareActor.Teardown()
   }
 
   def HandleWeaponFire(weaponGUID: PlanetSideGUID, projectileGUID: PlanetSideGUID, shotOrigin: Vector3): Unit = {
@@ -9450,7 +9447,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
 
   def failWithError(error: String) = {
     log.error(error)
-    middlewareActor ! MiddlewareActor.Close()
+    middlewareActor ! MiddlewareActor.Teardown()
   }
 
   def sendResponse(packet: PlanetSidePacket): Unit = {
diff --git a/src/main/scala/net/psforever/packet/game/objectcreate/ObjectClass.scala b/src/main/scala/net/psforever/packet/game/objectcreate/ObjectClass.scala
index 5f9f6074..804f9ec7 100644
--- a/src/main/scala/net/psforever/packet/game/objectcreate/ObjectClass.scala
+++ b/src/main/scala/net/psforever/packet/game/objectcreate/ObjectClass.scala
@@ -428,6 +428,8 @@ object ObjectClass {
   final val stealth_armor             = 837
   final val vehicle_terminal_combined = 952
 
+  final val game_properties = 343
+
   final val objectClassMap = scala.collection.mutable.Map[String, Int]()
 
   def ByName(name: String): Int = {