aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Events/GameEventMgr.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/game/Events/GameEventMgr.cpp')
-rw-r--r--src/server/game/Events/GameEventMgr.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp
index 3f52804fab5..88a47de0c40 100644
--- a/src/server/game/Events/GameEventMgr.cpp
+++ b/src/server/game/Events/GameEventMgr.cpp
@@ -983,9 +983,9 @@ void GameEventMgr::LoadHolidayDates()
if (uint32 duration = fields[3].GetUInt32())
entry->Duration[0] = duration;
- auto itr = std::lower_bound(modifiedHolidays.begin(), modifiedHolidays.end(), entry->Id);
- if (itr == modifiedHolidays.end() || *itr != entry->Id)
- modifiedHolidays.insert(itr, entry->Id);
+ auto itr = std::lower_bound(modifiedHolidays.begin(), modifiedHolidays.end(), entry->ID);
+ if (itr == modifiedHolidays.end() || *itr != entry->ID)
+ modifiedHolidays.insert(itr, entry->ID);
++count;
} while (result->NextRow());
@@ -1585,10 +1585,10 @@ void GameEventMgr::UpdateWorldStates(uint16 event_id, bool Activate)
if (bgTypeId != BATTLEGROUND_TYPE_NONE)
{
BattlemasterListEntry const* bl = sBattlemasterListStore.LookupEntry(bgTypeId);
- if (bl && bl->HolidayWorldStateId)
+ if (bl && bl->HolidayWorldState)
{
WorldPackets::WorldState::UpdateWorldState worldstate;
- worldstate.VariableID = bl->HolidayWorldStateId;
+ worldstate.VariableID = bl->HolidayWorldState;
worldstate.Value = Activate ? 1 : 0;
sWorld->SendGlobalMessage(worldstate.Write());
}