summaryrefslogtreecommitdiff
path: root/src/account-server/serverhandler.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/account-server/serverhandler.cpp')
-rw-r--r--src/account-server/serverhandler.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/account-server/serverhandler.cpp b/src/account-server/serverhandler.cpp
index f6d41fc5..2340d581 100644
--- a/src/account-server/serverhandler.cpp
+++ b/src/account-server/serverhandler.cpp
@@ -121,7 +121,16 @@ void ServerHandler::processMessage(NetComputer *comp, MessageIn &msg)
int id = msg.readLong();
Storage &store = Storage::instance("tmw");
PlayerPtr ptr = store.getCharacter(id);
- ptr->deserialize(msg);
+
+ if (ptr.get() != NULL)
+ {
+ ptr->deserialize(msg);
+ }
+ else
+ {
+ LOG_ERROR("Received player data for non-existing player " <<
+ id << ".");
+ }
} break;
case GAMSG_REDIRECT: