From abb4092cff48fac9a15c90611f90870e860b9699 Mon Sep 17 00:00:00 2001
From: hondacrx <prelude_20032002@yahoo.com>
Date: Thu, 1 Feb 2024 15:09:02 -0500
Subject: [PATCH] Core/Players: Fixed pvp flag being missing when logging in
 with war mode disabled but pvp enabled

Port From (https://github.com/TrinityCore/TrinityCore/commit/4abcf7fb337ac2ebe0a121f5ea19bb647addd7c0)
---
 Source/Game/Entities/Player/Player.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Source/Game/Entities/Player/Player.cs b/Source/Game/Entities/Player/Player.cs
index 5cba0add7..14baa426c 100644
--- a/Source/Game/Entities/Player/Player.cs
+++ b/Source/Game/Entities/Player/Player.cs
@@ -5119,7 +5119,8 @@ namespace Game.Entities
                 RemoveAurasDueToSpell(auraOutside);
                 RemoveAurasDueToSpell(auraInside);
                 RemovePlayerFlag(PlayerFlags.WarModeActive);
-                RemovePvpFlag(UnitPVPStateFlags.PvP);
+                if (!HasPlayerFlag(PlayerFlags.InPVP))
+                    RemovePvpFlag(UnitPVPStateFlags.PvP);
                 RemoveAurasWithInterruptFlags(SpellAuraInterruptFlags2.WarModeLeave);
             }
         }