From dca0c11d3709b592340c729999c1d72075d64c60 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Fri, 12 Jan 2007 21:32:48 +0000
Subject: Report problems with finding a certain character instead of crashing.

---
 src/account-server/serverhandler.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'src/account-server/serverhandler.cpp')

diff --git a/src/account-server/serverhandler.cpp b/src/account-server/serverhandler.cpp
index f6d41fc..2340d58 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:
-- 
cgit