summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/net/npchandler.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/net/npchandler.cpp b/src/net/npchandler.cpp
index 8ca529c8..8425a215 100644
--- a/src/net/npchandler.cpp
+++ b/src/net/npchandler.cpp
@@ -79,7 +79,8 @@ void NPCHandler::handleMessage(MessageIn *msg)
case SMSG_NPC_CLOSE:
id = msg->readInt32();
- current_npc = dynamic_cast<NPC*>(beingManager->findBeing(id));
+ if (current_npc == dynamic_cast<NPC*>(beingManager->findBeing(id)))
+ current_npc = NULL;
break;
case SMSG_NPC_NEXT: