From e17f7bf4d5ba9e0727d1987c7f93b43fe30b9751 Mon Sep 17 00:00:00 2001
From: VladimirMangos <vladimir@getmangos.com>
Date: Mon, 30 May 2011 12:00:18 +0400
Subject: [PATCH] [11569] Remove recently added area switch time duel check.

Only duel start expected to be limited by area.
Duel end controlled only distance/map and outOfBound timer
---
 src/game/Player.cpp      | 12 ------------
 src/game/Player.h        |  1 -
 src/shared/revision_nr.h |  2 +-
 3 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 78a1de3fc..fb2f4d94e 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -6791,9 +6791,6 @@ void Player::UpdateArea(uint32 newArea)
 
     if (area)
     {
-        // check leave duel allowed area
-        CheckDuelArea(area);
-
         // Dalaran restricted flight zone
         if ((area->flags & AREA_FLAG_CANNOT_FLY) && IsFreeFlying() && !isGameMaster() && !HasAura(58600))
             CastSpell(this, 58600, true);                   // Restricted Flight Area
@@ -6900,15 +6897,6 @@ void Player::UpdateZone(uint32 newZone, uint32 newArea)
     UpdateZoneDependentPets();
 }
 
-void Player::CheckDuelArea(AreaTableEntry const* areaEntry)
-{
-    if (!duel)
-        return;
-
-    if (!(areaEntry->flags & AREA_FLAG_DUEL))
-        DuelComplete(DUEL_FLED);
-}
-
 //If players are too far way of duel flag... then player loose the duel
 void Player::CheckDuelDistance(time_t currTime)
 {
diff --git a/src/game/Player.h b/src/game/Player.h
index 98f2edb0d..36d7d5c66 100644
--- a/src/game/Player.h
+++ b/src/game/Player.h
@@ -1719,7 +1719,6 @@ class MANGOS_DLL_SPEC Player : public Unit
         DuelInfo *duel;
         bool IsInDuelWith(Player const* player) const { return duel && duel->opponent == player && duel->startTime != 0; }
         void UpdateDuelFlag(time_t currTime);
-        void CheckDuelArea(AreaTableEntry const* areaEntry);
         void CheckDuelDistance(time_t currTime);
         void DuelComplete(DuelCompleteType type);
         void SendDuelCountdown(uint32 counter);
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 969600c33..35091c3dd 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "11568"
+ #define REVISION_NR "11569"
 #endif // __REVISION_NR_H__