From 65a62becc24e38e9412bd07911a69de437239156 Mon Sep 17 00:00:00 2001
From: Martin Ambrus <martin@martinambrus.com>
Date: Wed, 22 Nov 2017 11:47:17 +0100
Subject: [PATCH] fix: rat reinforcement does not arrive due to a wrong reinfs
 check

#366
---
 GameEngine/Automation.php |  2 +-
 GameEngine/Database.php   | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/GameEngine/Automation.php b/GameEngine/Automation.php
index b2630e1b..efb09dbb 100755
--- a/GameEngine/Automation.php
+++ b/GameEngine/Automation.php
@@ -3438,7 +3438,7 @@ class Automation {
                     $DefenderID = $database->getVillageField($data['to'],"owner");
                     if (isset($AttackerID) && $session->uid==$AttackerID || $session->uid==$DefenderID) $reload=true;
                     $database->addEnforce($data);
-                    $reinf = $database->getEnforce($data['to'],$data['from']);
+                    $reinf = $database->getEnforce($data['from'],$data['to']);
                     $database->modifyEnforce($reinf['id'],31,1,1);
                     $data_fail = '0,0,4,1,0,0,0,0,0,0,0,0,0,0';
                     $database->addNotice($to['owner'],$to['wref'],(isset($targetally) ? $targetally : 0),8,'village of the elders reinforcement '.addslashes($to['name']).'',$data_fail,$AttackArrivalTime);
diff --git a/GameEngine/Database.php b/GameEngine/Database.php
index 1aa6a30f..7712f1b9 100755
--- a/GameEngine/Database.php
+++ b/GameEngine/Database.php
@@ -6094,7 +6094,7 @@ References: User ID/Message ID, Mode
             }
         }
 
-        return ($array_passed ? self::$villageReinforcementsCache : self::$villageReinforcementsCache[$vid[0].$from[0]]);
+        return ($array_passed ? self::$villageFromReinforcementsCache : self::$villageFromReinforcementsCache[$vid[0].$from[0]]);
 	}
 
     function getOasisEnforce($ref, $mode=0, $use_cache = true) {
@@ -6211,7 +6211,7 @@ References: User ID/Message ID, Mode
 		$modes = [];
 
 		for($i = $start; $i <= $end; $i++) {
-		    $units[] = $i;
+		    $units[] = ($i < 0 ? 0 : $i);
 		    $amounts[] = $data['t' . $j . ''];
 		    $modes[] = 1;
 			$j++;
@@ -6237,7 +6237,7 @@ References: User ID/Message ID, Mode
 		$start2 = ($tribe - 1) * 10 + 1;
 		$start3 = ($tribe - 1) * 10;
 		if($start3 == 0){
-		$start3 = "";
+		    $start3 = "";
 		}
 		$end2 = ($tribe * 10);
 		//add unit
@@ -6248,11 +6248,11 @@ References: User ID/Message ID, Mode
         $modes = [];
 
 		for($i = $start; $i <= $end; $i++) {
-            $units[] = $i;
+            $units[] = ($i < 0 ? 0 : $i);
             $amounts[] = $data['t' . $j . ''];
             $modes[] = 1;
 
-            $units[] = $i;
+            $units[] = ($i < 0 ? 0 : $i);
             $amounts[] = ${'dead'.$j};
             $modes[] = 0;