diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-12-15 03:47:21 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-12-15 03:47:21 +0100 |
| commit | f7aedaef3303b38d2e54faaad6ff80b66aaea074 (patch) | |
| tree | 8f5df9c7482adafded212bee31ae68e91dbe1840 /src/server/shared/Utilities | |
| parent | 506ddbbf40d588840cd8eee810761b6a5ed44973 (diff) | |
| parent | dcfbe53552b0a242a88a068a6e3e7f4c863f2ffb (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Battlegrounds/BattlegroundMgr.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Handlers/QuestHandler.cpp
src/server/game/Spells/SpellInfo.h
src/server/game/World/World.cpp
Diffstat (limited to 'src/server/shared/Utilities')
| -rw-r--r-- | src/server/shared/Utilities/EventProcessor.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/server/shared/Utilities/EventProcessor.h b/src/server/shared/Utilities/EventProcessor.h index 8abf0f09dfe..f341019395d 100644 --- a/src/server/shared/Utilities/EventProcessor.h +++ b/src/server/shared/Utilities/EventProcessor.h @@ -28,7 +28,12 @@ class BasicEvent { public: - BasicEvent() { to_Abort = false; } + BasicEvent() + { + to_Abort = false; + m_addTime = 0; + m_execTime = 0; + } virtual ~BasicEvent() { } // override destructor to perform some actions on event removal // this method executes when the event is triggered |