diff options
| -rw-r--r-- | src/server/game/Events/GameEventMgr.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp index 8158e1dafbc..407da426f24 100644 --- a/src/server/game/Events/GameEventMgr.cpp +++ b/src/server/game/Events/GameEventMgr.cpp @@ -1696,7 +1696,7 @@ void GameEventMgr::SetHolidayEventTime(GameEventData& event) if (!event.holidayStage) // Ignore holiday return; - const HolidaysEntry* holiday = sHolidaysStore.LookupEntry(event.holiday_id); + HolidaysEntry const* holiday = sHolidaysStore.LookupEntry(event.holiday_id); if (!holiday->Date[0] || !holiday->Duration[0]) // Invalid definitions { diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index ee587490ab7..2afa5d6f75c 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -938,6 +938,13 @@ void ObjectMgr::CheckCreatureTemplate(CreatureTemplate const* cInfo) ok = true; } + if (cInfo->mingold > cInfo->maxgold) + { + TC_LOG_ERROR("sql.sql", "Creature (Entry: %u) has `mingold` %u which is greater than `maxgold` %u, setting `maxgold` to %u.", + cInfo->Entry, cInfo->mingold, cInfo->maxgold, cInfo->mingold); + const_cast<CreatureTemplate*>(cInfo)->maxgold = cInfo->mingold; + } + if (cInfo->AIName == "TotemAI") { TC_LOG_ERROR("sql.sql", "Creature (Entry: %u) has not-allowed `AIName` '%s' set, removing", cInfo->Entry, cInfo->AIName.c_str()); |