From fa4a96769e33e01e52740b6fc811be280e9ca87f Mon Sep 17 00:00:00 2001
From: hondacrx <prelude_20032002@yahoo.com>
Date: Sat, 1 Oct 2022 16:35:47 -0400
Subject: [PATCH] Core/Players: Fixed pvp talents being removed and immediately
 readded from players when entering/leaving Orgrimmar and Stormwind

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

diff --git a/Source/Game/Entities/Player/Player.cs b/Source/Game/Entities/Player/Player.cs
index 06cf65747..b05303a79 100644
--- a/Source/Game/Entities/Player/Player.cs
+++ b/Source/Game/Entities/Player/Player.cs
@@ -4680,14 +4680,14 @@ namespace Game.Entities
                 if (CanEnableWarModeInArea())
                 {
                     RemovePlayerFlag(PlayerFlags.WarModeActive);
-                    RemoveAurasDueToSpell(auraOutside);
                     CastSpell(this, auraInside, true);
+                    RemoveAurasDueToSpell(auraOutside);
                 }
                 else
                 {
                     SetPlayerFlag(PlayerFlags.WarModeActive);
-                    RemoveAurasDueToSpell(auraInside);
                     CastSpell(this, auraOutside, true);
+                    RemoveAurasDueToSpell(auraInside);
                 }
                 SetWarModeLocal(true);
                 SetPvpFlag(UnitPVPStateFlags.PvP);