Merge pull request #592 from arafarn12/master

fix bug calculate training settlers/chiefs
iopietro · Aug 27, 2019 · 233b53f · 233b53f
2 parents 693afb4 + 4f4e623
commit 233b53f
Showing 1 changed file with 6 additions and 12 deletions.
diff --git a/GameEngine/Database.php b/GameEngine/Database.php
@@ -7164,22 +7164,16 @@ public function getAvailableExpansionTraining() {
 			}
 		}
 
-		$q = "SELECT (u10+u20+u30) FROM " . TB_PREFIX . "enforcement WHERE `from` = ".(int) $village->wid;
+		$q = "SELECT (u10+u20+u30) as sumsettlers FROM " . TB_PREFIX . "enforcement WHERE `from` = ".(int) $village->wid;
 		$result = mysqli_query($this->dblink,$q);
-		$row = mysqli_fetch_row($result);
-		if(!empty($row)) {
-			foreach($row as $reinf) {
-				$settlers += $reinf[0];
-			}
+		while($settlersrow = mysqli_fetch_array($result)) {
+		    $settlers += $settlersrow["sumsettlers"];
 		}
 
-		$q = "SELECT (u9+u19+u29) FROM " . TB_PREFIX . "enforcement WHERE `from` = ".(int) $village->wid;
+		$q = "SELECT (u9+u19+u29) as sumchiefs FROM " . TB_PREFIX . "enforcement WHERE `from` = ".(int) $village->wid;
 		$result = mysqli_query($this->dblink,$q);
-		$row = mysqli_fetch_row($result);
-		if(!empty($row)) {
-			foreach($row as $reinf) {
-				$chiefs += $reinf[0];
-			}
+		while($chiefsrow = mysqli_fetch_array($result)) {
+		    $chiefs += $chiefsrow["sumchiefs"];
 		}
 
 		$trainlist = $technology->getTrainingList(4);