From 524cd7fb857632a73f8e77e40cfb458f478dcdaf Mon Sep 17 00:00:00 2001
From: Shadow <cata7007@gmail.com>
Date: Fri, 29 Nov 2013 09:25:53 +0200
Subject: [PATCH] Update Battle.php

---
 GameEngine/Battle.php | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/GameEngine/Battle.php b/GameEngine/Battle.php
index 67d9213a..128c23fa 100644
--- a/GameEngine/Battle.php
+++ b/GameEngine/Battle.php
@@ -282,13 +282,9 @@ class Battle {
             }
         }
                 
-        //get every enforcement in defender village
-        
-        if ($conqureby>0) { //def from oasis
-            $DefendersAll = $database->getOasisEnforce($DefenderWref,1);
-        } else {
-            $DefendersAll = $database->getEnforceVillage($DefenderWref,0);
-        }
+        //get every enforcement in defender village/oasis
+		
+        $DefendersAll = $database->getEnforceVillage($DefenderWref,0); 
         if(!empty($DefendersAll)){
     
         // Calculates the total points of the Defender