*Do not allow player to reset instance when he is in instance.

*Fix build bug in the last commit.

--HG--
branch : trunk
This commit is contained in:
megamage
2008-12-20 13:01:41 -06:00
parent dd7f4e92b2
commit 5fd5da0123
4 changed files with 5 additions and 4 deletions
+2 -1
View File
@@ -16036,7 +16036,8 @@ void Player::ResetInstances(uint8 method)
// if the map is loaded, reset it
Map *map = MapManager::Instance().FindMap(p->GetMapId(), p->GetInstanceId());
if(map && map->IsDungeon())
((InstanceMap*)map)->Reset(method);
if(!((InstanceMap*)map)->Reset(method))
continue;
// since this is a solo instance there should not be any players inside
if(method == INSTANCE_RESET_ALL || method == INSTANCE_RESET_CHANGE_DIFFICULTY)