From 1498f93e49b5941418007f9cbf46cb6ae5b244d8 Mon Sep 17 00:00:00 2001 From: lukaasm Date: Thu, 2 Jul 2009 15:38:07 +0300 Subject: [PATCH] [8108] Fixed a case in resetting group binds where the actual map reset was done even though it had permanent binds. This is a temp fix as the function should be rewritten to be more clear / less error prone. Signed-off-by: Wyk3d --- src/game/Group.cpp | 2 +- src/shared/revision_nr.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/game/Group.cpp b/src/game/Group.cpp index 12e416d0b..2513f0ac3 100644 --- a/src/game/Group.cpp +++ b/src/game/Group.cpp @@ -1504,7 +1504,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())) isEmpty = ((InstanceMap*)map)->Reset(method); if(SendMsgTo) diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index d8c5088ea..9fe4a39d3 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "8107" + #define REVISION_NR "8108" #endif // __REVISION_NR_H__