From e8b944710ae4810ef4bf01ddfaf4bf8bf4d98a84 Mon Sep 17 00:00:00 2001
From: UltraNix <80540499+UltraNix@users.noreply.github.com>
Date: Wed, 11 Aug 2021 02:15:22 +0200
Subject: [PATCH] fix(Core/Players): don't reset contested PvP timer if
 teleported between two maps (#7257)

- Closes #7077
---
 src/server/game/Entities/Player/Player.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index fe27c8095..27eabf23c 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -1460,8 +1460,6 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
 
             CombatStop();
 
-            ResetContestedPvP();
-
             // remove arena spell coldowns/buffs now to also remove pet's cooldowns before it's temporarily unsummoned
             if (mEntry->IsBattleArena() && (HasPendingSpectatorForBG(0) || !HasPendingSpectatorForBG(GetBattlegroundId())))
             {