mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 07:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[11783] Let scripting library decide if an encounter is in progress in instances

Browse source 
Replace wrong Group::InCombatToInstance check, this was preventing entering when any member is in any combat.

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
This commit is contained in:
Schmoozerd 2011-09-03 15:59:36 +02:00
parent 7c49e4afb6
commit aa40cf687f
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/game/Map.cpp
View file

@ -1261,9 +1261,8 @@ bool DungeonMap::CanEnter(Player *player)
return false; return false;
} }
// cannot enter while players in the instance are in combat // cannot enter while an encounter in the instance is in progress
Group *pGroup = player->GetGroup(); if (!player->isGameMaster() && GetInstanceData() && GetInstanceData()->IsEncounterInProgress() && player->GetMapId() != GetId())
if(pGroup && pGroup->InCombatToInstance(GetInstanceId()) && player->isAlive() && player->GetMapId() != GetId())
{ {
player->SendTransferAborted(GetId(), TRANSFER_ABORT_ZONE_IN_COMBAT); player->SendTransferAborted(GetId(), TRANSFER_ABORT_ZONE_IN_COMBAT);
return false; return false;

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "11782" #define REVISION_NR "11783"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__