diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-02-15 14:23:21 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-02-15 14:23:21 +0100 |
| commit | 6beda05e3d5cdf77a49fa1fcdfd5e64070d7a10c (patch) | |
| tree | 6106a48422550d02d501b276024c9c8306cff84e /src/server/game/Scripting | |
| parent | 3c5bf554ffa58e46eb88aebd46af21335d581432 (diff) | |
| parent | 45363b8216f03f2dd4ce21cfb5ce183560374dd8 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/World/World.h
Diffstat (limited to 'src/server/game/Scripting')
| -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 5a973395c68..dd479984178 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 \ |