diff options
| author | megamage <none@none> | 2009-02-13 20:12:01 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-02-13 20:12:01 -0600 |
| commit | 1c3f478ecc5745b880ca6610d64aa5522eb24b1b (patch) | |
| tree | abbaf56201c8b40f41bf5af20eb76c370ba32182 /src/game/Map.cpp | |
| parent | 59be8223e4f25e28ede94f9694a2b151caffd9ed (diff) | |
| parent | 29f3d67fb8d47ea25291fa040f1cfd33b53c9da6 (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Map.cpp')
| -rw-r--r-- | src/game/Map.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/Map.cpp b/src/game/Map.cpp index 40df012410b..f0fdbd346df 100644 --- a/src/game/Map.cpp +++ b/src/game/Map.cpp @@ -1781,7 +1781,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; |