From c26e78c9026c4b07831920a3fef141fc629d7297 Mon Sep 17 00:00:00 2001
From: hondacrx <prelude_20032002@yahoo.com>
Date: Wed, 15 Jun 2022 18:21:44 -0400
Subject: [PATCH] correctly apply npc pvp flags

Port From (https://github.com/TrinityCore/TrinityCore/commit/45bbbd5acd8b68b98860283d70d17b6ab527dcdf)
---
 Source/Game/Entities/Creature/Creature.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Game/Entities/Creature/Creature.cs b/Source/Game/Entities/Creature/Creature.cs
index 452b52dd1..f69e88da5 100644
--- a/Source/Game/Entities/Creature/Creature.cs
+++ b/Source/Game/Entities/Creature/Creature.cs
@@ -2395,7 +2395,7 @@ namespace Game.Entities
                 // 3 ShapeshiftForm     Must be determined/set by shapeshift spell/aura
 
                 SetSheath((SheathState)(cainfo.bytes2 & 0xFF));
-                ReplaceAllPvpFlags(UnitPVPStateFlags.None);
+                ReplaceAllPvpFlags((UnitPVPStateFlags)((cainfo.bytes2 >> 8) & 0xFF));
                 ReplaceAllPetFlags(UnitPetFlags.None);
                 SetShapeshiftForm(ShapeShiftForm.None);
             }