From e634533f912f9f76d4c7f8210a5ffb07eb007968 Mon Sep 17 00:00:00 2001
From: tartalo <none@none>
Date: Sun, 1 Nov 2009 15:58:05 +0100
Subject: Fix crash

--HG--
branch : trunk
---
 src/game/Map.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index 4b2c4d0486e..0093066bd1f 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -2524,7 +2524,7 @@ bool InstanceMap::CanEnter(Player *player)
     // cannot enter while an encounter is in progress on raids
     /*Group *pGroup = player->GetGroup();
     if(!player->isGameMaster() && pGroup && pGroup->InCombatToInstance(GetInstanceId()) && player->GetMapId() != GetId())*/
-    if (IsRaid() && GetInstanceData()->IsEncounterInProgress())
+    if (IsRaid() && GetInstanceData() && GetInstanceData()->IsEncounterInProgress())
     {
         player->SendTransferAborted(GetId(), TRANSFER_ABORT_ZONE_IN_COMBAT);
         return false;
-- 
cgit v1.2.3