diff options
author | Jinnaix <37972361+Jinnaix@users.noreply.github.com> | 2022-05-29 16:24:14 +0200 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2022-06-10 19:22:08 +0200 |
commit | 45bbbd5acd8b68b98860283d70d17b6ab527dcdf (patch) | |
tree | b99dc817d84c14a8d4c8d24e6a4afe6de4af736b /src | |
parent | bda1fac13f19d38b4e0e07d01d1b068def9aa81c (diff) |
correctly apply npc pvp flags (#27974)
(cherry picked from commit 2237926cec890d12849b0c8af14ada6dd6c7e6aa)
Diffstat (limited to 'src')
-rw-r--r-- | src/server/game/Entities/Creature/Creature.cpp | 2 |
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 35876800ea3..f70b4c7e5b5 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -2668,7 +2668,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); } |