diff options
| author | megamage <none@none.none> | 2011-10-07 12:48:20 -0400 |
|---|---|---|
| committer | megamage <none@none.none> | 2011-10-07 12:48:20 -0400 |
| commit | 42d1562183dd0598de155e30264393edc6925a21 (patch) | |
| tree | 73263639af50fcf177ff9bdf3791d8fc5afce454 /src/server/game/AI/CreatureAIImpl.h | |
| parent | 7f4be7e93a03c2f4c964590efb166c7dadcb6837 (diff) | |
| parent | 7f89678bcda1b58ff0701c0915074e81a9caf720 (diff) | |
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore.git
Conflicts:
src/server/game/Entities/Player/Player.cpp
Diffstat (limited to 'src/server/game/AI/CreatureAIImpl.h')
| -rwxr-xr-x | src/server/game/AI/CreatureAIImpl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/AI/CreatureAIImpl.h b/src/server/game/AI/CreatureAIImpl.h index 46060445ee9..848c2561f3f 100755 --- a/src/server/game/AI/CreatureAIImpl.h +++ b/src/server/game/AI/CreatureAIImpl.h @@ -329,7 +329,7 @@ class EventMap : private std::map<uint32, uint32> // Sets event phase, must be in range 1 - 8 void SetPhase(uint32 phase) { - if (phase && phase < 9) + if (phase && phase < 8) _phase = (1 << (phase + 24)); } @@ -340,7 +340,7 @@ class EventMap : private std::map<uint32, uint32> time += _time; if (groupId && groupId < 9) eventId |= (1 << (groupId + 16)); - if (phase && phase < 9) + if (phase && phase < 8) eventId |= (1 << (phase + 24)); const_iterator itr = find(time); while (itr != end()) |