diff options
| -rw-r--r-- | src/bindings/scripts/scripts/zone/naxxramas/boss_kelthuzad.cpp | 2 | ||||
| -rw-r--r-- | src/game/CreatureAIImpl.h | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_kelthuzad.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_kelthuzad.cpp index f2886cdf764..8cd606f42c4 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_kelthuzad.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_kelthuzad.cpp @@ -89,7 +89,7 @@ float Pos[12][4] = {3730.291260, -5027.239258,143.956909,4.461900},//LEFT_MIDDLE {3683.868652,-5057.281250,143.183884,5.237086},//LEFT_NEAR {3759.355225,-5174.128418,143.802383,2.170104},//RIGHT_FAR - {370.724365,-5185.123047,143.928024,1.309310},//RIGHT_MIDDLE + {3700.724365,-5185.123047,143.928024,1.309310},//RIGHT_MIDDLE {3665.121094,-5138.679199,143.183212,0.604023},//RIGHT_NEAR {3754.431396,-5080.727734,142.036316,3.736189},//LEFT_FAR {3724.396484, -5061.330566,142.032700, 4.564785},//LEFT_MIDDLE diff --git a/src/game/CreatureAIImpl.h b/src/game/CreatureAIImpl.h index 4bb21f1d5ba..e211c50043a 100644 --- a/src/game/CreatureAIImpl.h +++ b/src/game/CreatureAIImpl.h @@ -135,6 +135,13 @@ class EventMap : private std::map<uint32, uint32> return; uint32 eventId = begin()->second; erase(begin()); + time += m_time; + iterator itr = find(time); + while(itr != end()) + { + ++time; + itr = find(time); + } insert(std::make_pair(time, eventId)); } @@ -171,8 +178,7 @@ class EventMap : private std::map<uint32, uint32> erase(begin()); else { - uint32 eventId = (begin()->second & 0x0000FFFF); - return eventId; + return (begin()->second & 0x0000FFFF); } } return 0; |