From 69ae324676082795629677fd01aff0709a76c586 Mon Sep 17 00:00:00 2001
From: Sam <sum9900@web.de>
Date: Tue, 19 Nov 2013 00:55:42 +0100
Subject: [PATCH] Tiny setPVPMode fix

---
 modules/game_combatcontrols/combatcontrols.lua | 8 +++-----
 src/client/game.cpp                            | 2 ++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/game_combatcontrols/combatcontrols.lua b/modules/game_combatcontrols/combatcontrols.lua
index 5d0f1644..10c54479 100644
--- a/modules/game_combatcontrols/combatcontrols.lua
+++ b/modules/game_combatcontrols/combatcontrols.lua
@@ -141,7 +141,7 @@ function online()
         g_game.setFightMode(lastCombatControls[char].fightMode)
         g_game.setChaseMode(lastCombatControls[char].chaseMode)
         g_game.setSafeFight(lastCombatControls[char].safeFight)
-        if g_game.getFeature(GamePVPMode) and lastCombatControls[char].pvpMode then
+        if lastCombatControls[char].pvpMode then
           g_game.setPVPMode(lastCombatControls[char].pvpMode)
         end
       end
@@ -244,10 +244,8 @@ function onSetPVPMode(self, selectedPVPButton)
   elseif buttonId == 'redFistBox' then
     pvpMode = PVPRedFist
   end
-  
-  if g_game.getFeature(GamePVPMode) then
-    g_game.setPVPMode(pvpMode)
-  end
+
+  g_game.setPVPMode(pvpMode)
 end
 
 function onMiniWindowClose()
diff --git a/src/client/game.cpp b/src/client/game.cpp
index b61dd958..7a090cd4 100644
--- a/src/client/game.cpp
+++ b/src/client/game.cpp
@@ -1229,6 +1229,8 @@ void Game::setPVPMode(Otc::PVPModes pvpMode)
 {
     if(!canPerformGameAction())
         return;
+    if(!g_game.getFeature(Otc::GameFeature::PVPModes))
+        return;
     if(m_pvpMode == pvpMode)
         return;
     m_pvpMode = pvpMode;