From 08b111d24a66888fd93f6ba56624477f5381ae87 Mon Sep 17 00:00:00 2001
From: Pietro <iopietro@hotmail.it>
Date: Sun, 24 Feb 2019 13:58:06 +0100
Subject: [PATCH] Bug Fixes

+Fixed a bug that counted double upkeep for reinforcements of other players in oases
---
 GameEngine/Technology.php | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/GameEngine/Technology.php b/GameEngine/Technology.php
index de1d31c0..2b3a7d6c 100755
--- a/GameEngine/Technology.php
+++ b/GameEngine/Technology.php
@@ -252,7 +252,7 @@ function getAllUnits($base, $InVillageOnly = false, $mode = 0, $useCache = true)
 			}
 		}
 		if($mode == 0){
-		    $enforceoasis = $database->getOasisEnforce($base, 0, $useCache);
+			$enforceoasis = $database->getOasisEnforce($base, 1, $useCache);
 			if(count($enforceoasis) > 0){
 				foreach($enforceoasis as $enforce){
 					for($i = 1; $i <= 50; $i++){
@@ -261,15 +261,6 @@ function getAllUnits($base, $InVillageOnly = false, $mode = 0, $useCache = true)
 					$ownunit['hero'] += $enforce['hero'];
 				}
 			}
-			$enforceoasis1 = $database->getOasisEnforce($base, 1, $useCache);
-			if(count($enforceoasis1) > 0){
-				foreach($enforceoasis1 as $enforce){
-					for($i = 1; $i <= 50; $i++){
-						$ownunit['u' . $i] += $enforce['u' . $i];
-					}
-					$ownunit['hero'] += $enforce['hero'];
-				}
-			}
 			
 			$prisoners = $database->getPrisoners($base, 1, $useCache);
 			if(!empty($prisoners)){