From 29f3d67fb8d47ea25291fa040f1cfd33b53c9da6 Mon Sep 17 00:00:00 2001
From: Blaymoira <none@none>
Date: Fri, 13 Feb 2009 23:53:06 +0100
Subject: *Prevent entering in instances if zone in combat - by Iskander

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

(limited to 'src/game/Map.cpp')

diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index dd62f1e1c9f..66542030464 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -1762,7 +1762,7 @@ bool InstanceMap::CanEnter(Player *player)
 
     // cannot enter while players in the instance are in combat
     Group *pGroup = player->GetGroup();
-    if(!player->isGameMaster() && pGroup && pGroup->InCombatToInstance(GetInstanceId()) && player->isAlive() && player->GetMapId() != GetId())
+    if(!player->isGameMaster() && pGroup && pGroup->InCombatToInstance(GetInstanceId()) && player->GetMapId() != GetId())
     {
         player->SendTransferAborted(GetId(), TRANSFER_ABORT_ZONE_IN_COMBAT);
         return false;
-- 
cgit v1.2.3