diff options
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index c8e548d1a39..1239fccfaa1 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -5838,8 +5838,10 @@ void ObjectMgr::LoadEventSet() // Load all possible event ids from gameobjects for (auto const& gameObjectTemplatePair : _gameObjectTemplateStore) - if (uint32 eventId = gameObjectTemplatePair.second.GetEventScriptId()) - _eventStore.insert(eventId); + { + EventContainer eventSet = gameObjectTemplatePair.second.GetEventScriptSet(); + _eventStore.insert(eventSet.begin(), eventSet.end()); + } // Load all possible event ids from spells for (SpellNameEntry const* spellNameEntry : sSpellNameStore) @@ -5877,7 +5879,7 @@ void ObjectMgr::LoadEventScripts() for (ScriptMapMap::const_iterator itr = sEventScripts.begin(); itr != sEventScripts.end(); ++itr) { if (!IsValidEvent(itr->first)) - TC_LOG_ERROR("sql.sql", "Table `event_scripts` has script (Id: {}) not referring to any gameobject_template (type 3 data6 field, type 7 data3 field, type 10 data2 field, type 13 data2 field, type 50 data7 field), any taxi path node or any spell effect {}", + TC_LOG_ERROR("sql.sql", "Table `event_scripts` has script (Id: {}) not referring to any gameobject_template (data field referencing GameEvent), any taxi path node or any spell effect {}", itr->first, SPELL_EFFECT_SEND_EVENT); } @@ -5901,7 +5903,7 @@ void ObjectMgr::LoadEventScripts() if (!IsValidEvent(eventId)) { - TC_LOG_ERROR("sql.sql", "Event (ID: {}) not referring to any gameobject_template (type 3 data6 field, type 7 data3 field, type 10 data2 field, type 13 data2 field, type 50 data7 field), any taxi path node or any spell effect {}", + TC_LOG_ERROR("sql.sql", "Event (ID: {}) not referring to any gameobject_template (data field referencing GameEvent), any taxi path node or any spell effect {}", eventId, SPELL_EFFECT_SEND_EVENT); continue; } |