diff options
Diffstat (limited to 'src/game/Group.cpp')
| -rw-r--r-- | src/game/Group.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/Group.cpp b/src/game/Group.cpp index c08d1236c32..8a02afa25d2 100644 --- a/src/game/Group.cpp +++ b/src/game/Group.cpp @@ -967,7 +967,7 @@ void Group::SendUpdate() void Group::UpdatePlayerOutOfRange(Player* pPlayer) { - if(!pPlayer) + if(!pPlayer || !pPlayer->IsInWorld()) return; Player *player; @@ -1510,7 +1510,7 @@ void Group::ResetInstances(uint8 method, Player* SendMsgTo) bool isEmpty = true; // if the map is loaded, reset it Map *map = MapManager::Instance().FindMap(p->GetMapId(), p->GetInstanceId()); - if(map && map->IsDungeon()) + if(map && map->IsDungeon() && !(method == INSTANCE_RESET_GROUP_DISBAND && !p->CanReset())) { if(p->CanReset()) isEmpty = ((InstanceMap*)map)->Reset(method); |