diff options
Diffstat (limited to 'src/server/scripts/Commands')
| -rw-r--r-- | src/server/scripts/Commands/cs_modify.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/Commands/cs_npc.cpp | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/server/scripts/Commands/cs_modify.cpp b/src/server/scripts/Commands/cs_modify.cpp index 7f570f938b6..f505ee0a8af 100644 --- a/src/server/scripts/Commands/cs_modify.cpp +++ b/src/server/scripts/Commands/cs_modify.cpp @@ -227,7 +227,7 @@ public: flag = target->m_unitData->Flags; if (!npcflag) - memcpy(&npcflag.emplace(), target->m_unitData->NpcFlags.begin(), sizeof(uint64)); + npcflag = (uint64(target->GetNpcFlags2()) << 32) | target->GetNpcFlags(); if (!dyflag) dyflag = target->m_objectData->DynamicFlags; diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp index d572ce44765..376fd0da969 100644 --- a/src/server/scripts/Commands/cs_npc.cpp +++ b/src/server/scripts/Commands/cs_npc.cpp @@ -481,8 +481,7 @@ public: CreatureTemplate const* cInfo = target->GetCreatureTemplate(); uint32 faction = target->GetFaction(); - uint64 npcflags; - memcpy(&npcflags, target->m_unitData->NpcFlags.begin(), sizeof(npcflags)); + uint64 npcflags = (uint64(target->GetNpcFlags2()) << 32) | target->GetNpcFlags(); uint64 mechanicImmuneMask = 0; if (CreatureImmunities const* immunities = SpellMgr::GetCreatureImmunities(cInfo->CreatureImmunitiesId)) mechanicImmuneMask = immunities->Mechanic.to_ullong(); @@ -551,7 +550,7 @@ public: if (cInfo->flags_extra & flag) handler->PSendSysMessage("%s (0x%X)", EnumUtils::ToTitle(flag), flag); - handler->PSendSysMessage(LANG_NPCINFO_NPC_FLAGS, target->m_unitData->NpcFlags[0]); + handler->PSendSysMessage(LANG_NPCINFO_NPC_FLAGS, uint32(target->GetNpcFlags())); for (NPCFlags flag : EnumUtils::Iterate<NPCFlags>()) if (target->HasNpcFlag(flag)) handler->PSendSysMessage("* %s (0x%X)", EnumUtils::ToTitle(flag), flag); |