fix(Core/Players): don't reset contested PvP timer if teleported between two maps (#7257)

- Closes #7077
2021-08-11 02:15:22 +02:00 · 2021-08-11 02:15:22 +02:00 · e8b944710a
commit e8b944710a
parent 6ff0e07b41
1 changed files with 0 additions and 2 deletions
--- 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())))
            {