aboutsummaryrefslogtreecommitdiff
path: root/src/game/MapManager.cpp
diff options
context:
space:
mode:
authorMachiavelli <none@none>2010-03-27 15:09:26 +0100
committerMachiavelli <none@none>2010-03-27 15:09:26 +0100
commit9ce6094dce579c328a51a5dd19deb85ab88e9c88 (patch)
treef14b07b41699da79d45c2dfd38c9e4f4a9e94a4f /src/game/MapManager.cpp
parentbe739e99009c2796d0153e7b3dabcf819e915541 (diff)
Partial implementation of instance system patch by scarymovie87, fix max players check in instance. Cause of error was a pointer of class Player was casted to class InstanceMap. Refs issue #1323
--HG-- branch : trunk
Diffstat (limited to 'src/game/MapManager.cpp')
-rw-r--r--src/game/MapManager.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/MapManager.cpp b/src/game/MapManager.cpp
index efc59aadbd1..8613a1a1de8 100644
--- a/src/game/MapManager.cpp
+++ b/src/game/MapManager.cpp
@@ -257,7 +257,7 @@ bool MapManager::CanPlayerEnter(uint32 mapid, Player* player)
}
//Instance is full
- MapDifficulty const* mapDiff = ((InstanceMap*)player)->GetMapDifficulty();
+ MapDifficulty const* mapDiff = ((InstanceMap*)boundedMap)->GetMapDifficulty();
int8 maxPlayers = mapDiff ? mapDiff->maxPlayers : 0;
if (maxPlayers != -1) //-1: unlimited access
{