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)
2024-02-01 15:09:02 -05:00
parent 2a7273f1ec
commit abb4092cff
1 changed files with 2 additions and 1 deletions
@@ -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);
            }
        }