diff options
| author | Blaymoira <none@none> | 2009-02-13 23:53:06 +0100 |
|---|---|---|
| committer | Blaymoira <none@none> | 2009-02-13 23:53:06 +0100 |
| commit | 29f3d67fb8d47ea25291fa040f1cfd33b53c9da6 (patch) | |
| tree | 6cd473f8fff6f083d3a8b1cafdf47c943fefe69d /src/game/Map.cpp | |
| parent | ffb5fb7445e7766c6eca0b4b2c4d254a89d91d0e (diff) | |
*Prevent entering in instances if zone in combat - by Iskander
--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 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; |