diff options
author | Shauren <shauren.trinity@gmail.com> | 2013-02-14 16:54:31 +0100 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2013-02-14 16:54:31 +0100 |
commit | d232977ec4f6bd90affc0c1d429138ba630ad92d (patch) | |
tree | fc084289902f2f4176fe283e31a2699fe901543d /src/server/game/Scripting/ScriptMgr.cpp | |
parent | 771598b67ad3263ad7e172d1589f1bce5e10861c (diff) |
Core/Maps: Prevent creating maps without a valid Map.dbc entry
Closes #9181
Diffstat (limited to 'src/server/game/Scripting/ScriptMgr.cpp')
-rw-r--r-- | src/server/game/Scripting/ScriptMgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index 8321b88962f..32fe5d2ef33 100644 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -489,14 +489,14 @@ void ScriptMgr::OnGroupRateCalculation(float& rate, uint32 count, bool isRaid) } #define SCR_MAP_BGN(M, V, I, E, C, T) \ - if (V->GetEntry()->T()) \ + if (V->GetEntry() && V->GetEntry()->T()) \ { \ FOR_SCRIPTS(M, I, E) \ { \ MapEntry const* C = I->second->GetEntry(); \ if (!C) \ continue; \ - if (entry->MapID == V->GetId()) \ + if (C->MapID == V->GetId()) \ { #define SCR_MAP_END \ |