From 6891fe6248ca0016fdb520bc8db2a1929c299c67 Mon Sep 17 00:00:00 2001
From: Vincent-Michael <Vincent_Michael@gmx.de>
Date: Tue, 21 Aug 2012 23:01:24 +0200
Subject: Core/Battlefield: Add missing stuff for wintergrasp

---
 src/server/game/Entities/Object/Object.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/server/game/Entities/Object')

diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp
index 9138dcedc27..2e4ad07f86d 100755
--- a/src/server/game/Entities/Object/Object.cpp
+++ b/src/server/game/Entities/Object/Object.cpp
@@ -2335,7 +2335,12 @@ void WorldObject::SetZoneScript()
             if (Battlefield* bf = sBattlefieldMgr->GetBattlefieldToZoneId(GetZoneId()))
                 m_zoneScript = bf;
             else
-                m_zoneScript = sOutdoorPvPMgr->GetZoneScript(GetZoneId());
+            {
+                if (Battlefield* bf = sBattlefieldMgr->GetBattlefieldToZoneId(GetZoneId()))
+                    m_zoneScript = bf;
+                else
+                    m_zoneScript = sOutdoorPvPMgr->GetZoneScript(GetZoneId());
+            }
         }
     }
 }
-- 
cgit v1.2.3