From 2237926cec890d12849b0c8af14ada6dd6c7e6aa Mon Sep 17 00:00:00 2001
From: Jinnaix <37972361+Jinnaix@users.noreply.github.com>
Date: Sun, 29 May 2022 16:24:14 +0200
Subject: correctly apply npc pvp flags (#27974)

---
 src/server/game/Entities/Creature/Creature.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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);
     }
-- 
cgit v1.2.3