From 3e079669860569990a179894b6861177fb1bef2d Mon Sep 17 00:00:00 2001
From: QAston <none@none>
Date: Sun, 28 Jun 2009 17:18:46 +0200
Subject: *Fix the bug that pet is still attacking his enemy even if enemy has
 just entered sanctuary.

--HG--
branch : trunk
---
 src/game/Player.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/game/Player.cpp')

diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 0c3438ae509..62f712aabf1 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -6343,10 +6343,11 @@ void Player::UpdateZone(uint32 newZone, uint32 newArea)
     }
 
     pvpInfo.inNoPvPArea = false;
-    if((zone->flags & AREA_FLAG_SANCTUARY) || zone->mapid == 609)       // in sanctuary
+    if(zone->IsSanctuary())       // in sanctuary
     {
         SetByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_SANCTUARY);
         pvpInfo.inNoPvPArea = true;
+        CombatStopWithPets();
     }
     else
     {
-- 
cgit v1.2.3