[8103] More wide use IsInWorld checks and delayed at teleport operations. Author: Ambal

    * IsInWorld used to prevent return unexpected not in world objects.
    * Delayed operations need to process its in world state.

--HG--
branch : trunk

1 files changed, 2 insertions, 2 deletions

diff --git a/src/game/NPCHandler.cpp b/src/game/NPCHandler.cpp
index c60d368659a..bb9823ee71f 100644
--- a/src/game/NPCHandler.cpp
+++ b/src/game/NPCHandler.cpp
@@ -422,7 +422,7 @@ void WorldSession::HandleBinderActivateOpcode( WorldPacket & recv_data )
     uint64 npcGUID;
     recv_data >> npcGUID;
 
-    if(!GetPlayer()->isAlive())
+    if(!GetPlayer()->IsInWorld() || !GetPlayer()->isAlive())
         return;
 
     Creature *unit = GetPlayer()->GetNPCIfCanInteractWith(npcGUID,UNIT_NPC_FLAG_INNKEEPER);
@@ -442,7 +442,7 @@ void WorldSession::HandleBinderActivateOpcode( WorldPacket & recv_data )
 void WorldSession::SendBindPoint(Creature *npc)
 {
     // prevent set homebind to instances in any case
-    if(sMapStore.LookupEntry(GetPlayer()->GetMapId())->Instanceable())
+    if(GetPlayer()->GetMap()->Instanceable())
         return;
 
     uint32 bindspell = 3286;