*Merge

--HG--
branch : trunk

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)
         {