diff options
| author | megamage <none@none> | 2008-12-20 13:01:41 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2008-12-20 13:01:41 -0600 |
| commit | 5fd5da0123323a01731b674cc1c34410c1120d47 (patch) | |
| tree | fc06b41661ac42e31b1aef45a6817d77c9246bac /src/game/Player.cpp | |
| parent | dd7f4e92b2b20cfab4db96993203e8903104ea0c (diff) | |
*Do not allow player to reset instance when he is in instance.
*Fix build bug in the last commit.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Player.cpp')
| -rw-r--r-- | src/game/Player.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 9bbd48e1862..cbd5003e12b 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -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) |