diff options
| author | megamage <none@none> | 2009-06-18 20:26:49 -0500 |
|---|---|---|
| committer | megamage <none@none> | 2009-06-18 20:26:49 -0500 |
| commit | e0553121f276be21d0c8162b79d1a87f814d0ee3 (patch) | |
| tree | 686c8a7e475e0935fd564ded51c87c58312c568c /src/game/Group.cpp | |
| parent | a49c2982ba975a4c5dba7b1bf6a31a7c54a13c1d (diff) | |
| parent | 294c8a734e4b0054527b93a35e08cda8e0062733 (diff) | |
*Merge
--HG--
branch : trunk
Diffstat (limited to 'src/game/Group.cpp')
| -rw-r--r-- | src/game/Group.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/game/Group.cpp b/src/game/Group.cpp index 24e5601abe8..c08d1236c32 100644 --- a/src/game/Group.cpp +++ b/src/game/Group.cpp @@ -1511,7 +1511,12 @@ void Group::ResetInstances(uint8 method, Player* SendMsgTo) // if the map is loaded, reset it Map *map = MapManager::Instance().FindMap(p->GetMapId(), p->GetInstanceId()); if(map && map->IsDungeon()) - isEmpty = ((InstanceMap*)map)->Reset(method); + { + if(p->CanReset()) + isEmpty = ((InstanceMap*)map)->Reset(method); + else + isEmpty = !map->HavePlayers(); + } if(SendMsgTo) { |