aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJinnaix <37972361+Jinnaix@users.noreply.github.com>2022-05-29 16:24:14 +0200
committerGitHub <noreply@github.com>2022-05-29 16:24:14 +0200
commit2237926cec890d12849b0c8af14ada6dd6c7e6aa (patch)
treef92a69e53cf0e0eed9962f62608d32f7164b5ec8
parent38dc5667ba13d5c1d094330b0f57ba0ee9b2dde5 (diff)
correctly apply npc pvp flags (#27974)
-rw-r--r--src/server/game/Entities/Creature/Creature.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index 92e218bf25f..c9230146340 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -2544,7 +2544,7 @@ bool Creature::LoadCreaturesAddon()
// 3 ShapeshiftForm Must be determined/set by shapeshift spell/aura
SetSheath(SheathState(cainfo->bytes2 & 0xFF));
- ReplaceAllPvpFlags(UNIT_BYTE2_FLAG_NONE);
+ ReplaceAllPvpFlags(UnitPVPStateFlags((cainfo->bytes2 >> 8) & 0xFF));
ReplaceAllPetFlags(UNIT_PET_FLAG_NONE);
SetShapeshiftForm(FORM_NONE);
}