From d19ecaa817d79c7ae4355fe3c2117dee51579adb Mon Sep 17 00:00:00 2001
From: Machiavelli <none@none>
Date: Sun, 11 Oct 2009 12:27:50 +0200
Subject: Fix CONFIG_OUTDOORPVP_WINTERGRASP_ENABLED by doing a check in
 OPvPWintergrasp::Update as well as SetupOutDoorPvP

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

(limited to 'src')

diff --git a/src/game/Wintergrasp.cpp b/src/game/Wintergrasp.cpp
index fed7c6088a7..97d0d74e6c6 100644
--- a/src/game/Wintergrasp.cpp
+++ b/src/game/Wintergrasp.cpp
@@ -851,6 +851,9 @@ void OPvPWintergrasp::UpdateClock()
 
 bool OPvPWintergrasp::Update(uint32 diff)
 {
+    if(!sWorld.getConfig(CONFIG_OUTDOORPVP_WINTERGRASP_ENABLED))
+        return false;
+
     if (m_timer > diff)
     {
         m_timer -= diff;
-- 
cgit v1.2.3