Made the game server execute the chr_respawn_accept script even

in case of disconnection.

I made the Character::disconnected() function handle that case,
permitting also to centralize GameState::remove() calls there.

I also made the GameState::enqueueWarp() function test whether
the Character pointer is about to be deleted, so that the warp
can be handled directly to avoid a crash.

Last but not least, I also made the Character::update() function
not update the Character specials and hp to avoid discrepancies
seen in the client.

Resolves: Mana-Mantis #309.

Reviewed-by: Ablu.

1 files changed, 13 insertions, 0 deletions

diff --git a/src/game-server/state.cpp b/src/game-server/state.cpp
index 67130070..1d72e201 100644
--- a/src/game-server/state.cpp
+++ b/src/game-server/state.cpp
@@ -720,6 +720,11 @@ void GameState::warp(Character *ptr, MapComposite *map, int x, int y)
        a disconnection. */
     accountHandler->sendCharacterData(ptr);
 
+    // If the player has just left, The character pointer is also about
+    // to be deleted. So we don't have to do anything else.
+    if (!ptr->isConnected())
+        return;
+
     if (map->isActive())
     {
         if (!insert(ptr))
@@ -766,6 +771,14 @@ void GameState::enqueueRemove(Actor *ptr)
 
 void GameState::enqueueWarp(Character *ptr, MapComposite *m, int x, int y)
 {
+    // When the player has just disconnected, better not wait for the pointer
+    // to become invalid.
+    if (!ptr->isConnected())
+    {
+        warp(ptr, m, x, y);
+        return;
+    }
+
     DelayedEvent e = { EVENT_WARP, x, y, m };
     enqueueEvent(ptr, e);
 }