From 455959c6064af6f7863a6b4b57cb0ef1646bd8ef Mon Sep 17 00:00:00 2001 From: Shauren Date: Mon, 3 Jun 2019 20:40:34 +0200 Subject: Core/PacketIO: Rewrite updatefield handling --- src/server/game/Events/GameEventMgr.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/server/game/Events/GameEventMgr.cpp') diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp index 512b8045e55..2f3102f5e65 100644 --- a/src/server/game/Events/GameEventMgr.cpp +++ b/src/server/game/Events/GameEventMgr.cpp @@ -1160,11 +1160,12 @@ void GameEventMgr::UpdateEventNPCFlags(uint16 event_id) for (auto itr = creatureBounds.first; itr != creatureBounds.second; ++itr) { Creature* creature = itr->second; - uint32 npcflag = GetNPCFlag(creature); + uint64 npcflag = GetNPCFlag(creature); if (CreatureTemplate const* creatureTemplate = creature->GetCreatureTemplate()) npcflag |= creatureTemplate->npcflag; - creature->SetUInt64Value(UNIT_NPC_FLAGS, npcflag); + creature->SetNpcFlags(NPCFlags(npcflag & 0xFFFFFFFF)); + creature->SetNpcFlags2(NPCFlags2(npcflag >> 32)); // reset gossip options, since the flag change might have added / removed some //cr->ResetGossipOptions(); } -- cgit v1.2.3