xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-09-03 17:07:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix database

Browse Source
This commit is contained in:
Catalin Novgorodschi
2022-02-21 09:15:37 +02:00
committed by GitHub
parent 131f0207aa
commit 3925a76e9b
1 changed files with 22 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Database.php
+22 -27
View File
@@ -1135,7 +1135,7 @@ class MYSQLi_DB implements IDbConnection {
$q = "SELECT timestamp from " . TB_PREFIX . "deleting where uid = $uid LIMIT 1"; $q = "SELECT timestamp from " . TB_PREFIX . "deleting where uid = $uid LIMIT 1";
$result = mysqli_query($this->dblink,$q); $result = mysqli_query($this->dblink,$q);
$dbarray = mysqli_fetch_array($result); $dbarray = mysqli_fetch_array($result);
return ( $dbarray ? $dbarray['timestamp'] : false ); return $dbarray['timestamp'];
} }
function modifyGold($userid, $amt, $mode) { function modifyGold($userid, $amt, $mode) {
@@ -3853,7 +3853,7 @@ class MYSQLi_DB implements IDbConnection {
"); ");
$row = mysqli_fetch_array($result, MYSQLI_ASSOC); $row = mysqli_fetch_array($result, MYSQLI_ASSOC);
self::$fieldLevelsInVillageSearchCache[$vid.$fieldType] = ( $row ? $row['level'] : 0 ); self::$fieldLevelsInVillageSearchCache[$vid.$fieldType] = $row['level'];
return self::$fieldLevelsInVillageSearchCache[$vid.$fieldType]; return self::$fieldLevelsInVillageSearchCache[$vid.$fieldType];
} }
@@ -5257,13 +5257,12 @@ References: User ID/Message ID, Mode
function modifyBData($wid, $field, $levels, $tribe){ function modifyBData($wid, $field, $levels, $tribe){
list($wid, $field, $levels, $tribe) = $this->escape_input((int) $wid, (int) $field, (int) $levels, (int) $tribe); list($wid, $field, $levels, $tribe) = $this->escape_input((int) $wid, (int) $field, (int) $levels, (int) $tribe);
if ( is_array( $levels ) && $levels[0] == 0){ if($levels[0] == 0){
$q = "SELECT id FROM " .TB_PREFIX. "bdata WHERE wid = $wid AND field = $field"; $q = "SELECT id FROM " .TB_PREFIX. "bdata WHERE wid = $wid AND field = $field";
$orders = $this->mysqli_fetch_all(mysqli_query($this->dblink, $q)); $orders = $this->mysqli_fetch_all(mysqli_query($this->dblink, $q));
foreach($orders as $order) $this->removeBuilding($order['id'], $tribe, $wid); foreach($orders as $order) $this->removeBuilding($order['id'], $tribe, $wid);
} else {
mysqli_query( $this->dblink, $q = "UPDATE " . TB_PREFIX . "bdata SET level = level - $levels[1] + $levels[0] WHERE wid = $wid AND field = $field" );
} }
else mysqli_query($this->dblink, $q = "UPDATE " .TB_PREFIX. "bdata SET level = level - $levels[1] + $levels[0] WHERE wid = $wid AND field = $field");
} }
private function getBData($wid, $use_cache = true, $orderByID = false) { private function getBData($wid, $use_cache = true, $orderByID = false) {
@@ -6011,7 +6010,7 @@ References: User ID/Message ID, Mode
*/ */
function addUnits($vid, $troopsArray = null) { function addUnits($vid, $troopsArray = null) {
list($vid) = $this->escape_input($vid); list($vid, $type, $values) = $this->escape_input($vid, $type, $values);
if (!is_array($vid)) $vid = [$vid]; if (!is_array($vid)) $vid = [$vid];
$types = $values = ""; $types = $values = "";
@@ -6119,22 +6118,12 @@ References: User ID/Message ID, Mode
$end = ( $ownertribe * 10 ); $end = ( $ownertribe * 10 );
for ( $i = $start; $i <= $end; $i ++ ) { for ( $i = $start; $i <= $end; $i ++ ) {
if ( $movingunits ) {
$totalunits += $movingunits[ 'u' . $i ]; $totalunits += $movingunits[ 'u' . $i ];
}
if ( $reinforcingunits ) {
$totalunits += $reinforcingunits[ 'u' . $i ]; $totalunits += $reinforcingunits[ 'u' . $i ];
}
} }
if ( $movingunits ) { $totalunits += $movingunits['hero'];
$totalunits += $movingunits['hero']; $totalunits += $reinforcingunits['hero'];
}
if ( $reinforcingunits ) {
$totalunits += $reinforcingunits['hero'];
}
return $totalunits; return $totalunits;
} }
@@ -6439,7 +6428,7 @@ References: User ID/Message ID, Mode
//Fixed part of negative troops (double troops) - by InCube //Fixed part of negative troops (double troops) - by InCube
$array_amt[$i] = (int) $array_amt[$i] < 0 ? 0 : $array_amt[$i]; $array_amt[$i] = (int) $array_amt[$i] < 0 ? 0 : $array_amt[$i];
//Fixed part of negative troops (double troops) - by InCube //Fixed part of negative troops (double troops) - by InCube
$units .= $unit.' = '.$unit.' '.((isset($array_mode) && $array_mode[$i] == 1)? '+':'-').' '.( isset($array_amt[$i]) ? $array_amt[$i] : 0).(($number > $i+1) ? ', ' : ''); $units .= $unit.' = '.$unit.' '.(($array_mode[$i] == 1)? '+':'-').' '.($array_amt[$i] ? $array_amt[$i] : 0).(($number > $i+1) ? ', ' : '');
} }
$q = "UPDATE ".TB_PREFIX."units set $units WHERE vref = $vref"; $q = "UPDATE ".TB_PREFIX."units set $units WHERE vref = $vref";
return mysqli_query($this->dblink, $q); return mysqli_query($this->dblink, $q);
@@ -7175,16 +7164,22 @@ References: User ID/Message ID, Mode
} }
} }
$q = "SELECT (u10+u20+u30) as sumsettlers FROM " . TB_PREFIX . "enforcement WHERE `from` = ".(int) $village->wid; $q = "SELECT (u10+u20+u30) FROM " . TB_PREFIX . "enforcement WHERE `from` = ".(int) $village->wid;
$result = mysqli_query($this->dblink,$q); $result = mysqli_query($this->dblink,$q);
while($settlersrow = mysqli_fetch_array($result)) { $row = mysqli_fetch_row($result);
$settlers += $settlersrow["sumsettlers"]; if(!empty($row)) {
foreach($row as $reinf) {
$settlers += $reinf[0];
}
} }
$q = "SELECT (u9+u19+u29) as sumchiefs FROM " . TB_PREFIX . "enforcement WHERE `from` = ".(int) $village->wid; $q = "SELECT (u9+u19+u29) FROM " . TB_PREFIX . "enforcement WHERE `from` = ".(int) $village->wid;
$result = mysqli_query($this->dblink,$q); $result = mysqli_query($this->dblink,$q);
while($chiefsrow = mysqli_fetch_array($result)) { $row = mysqli_fetch_row($result);
$chiefs += $chiefsrow["sumchiefs"]; if(!empty($row)) {
foreach($row as $reinf) {
$chiefs += $reinf[0];
}
} }
$trainlist = $technology->getTrainingList(4); $trainlist = $technology->getTrainingList(4);
@@ -7739,7 +7734,7 @@ References: User ID/Message ID, Mode
$q = 'SELECT * FROM ' . TB_PREFIX . 'farmlist WHERE owner = '.$uid.' ORDER BY wref ASC LIMIT 1'; $q = 'SELECT * FROM ' . TB_PREFIX . 'farmlist WHERE owner = '.$uid.' ORDER BY wref ASC LIMIT 1';
$result = mysqli_query($this->dblink,$q); $result = mysqli_query($this->dblink,$q);
$dbarray = mysqli_fetch_array($result); $dbarray = mysqli_fetch_array($result);
return ( $dbarray && $dbarray['id'] > 0 ); return $dbarray['id'] > 0;
} }
// no need to cache this method // no need to cache this method
@@ -7914,7 +7909,7 @@ References: User ID/Message ID, Mode
$getVillage = $this->getVillage($wref); $getVillage = $this->getVillage($wref);
//Exlude Support, Nature, Natars, TaskMaster and Multihunter //Exlude Support, Nature, Natars, TaskMaster and Multihunter
if ($getVillage && $getVillage['owner'] > 5){ if ($getVillage['owner'] > 5){
$crop = $this->getCropProdstarv($wref, false); $crop = $this->getCropProdstarv($wref, false);
$unitArrays = $technology->getAllUnits($wref, false, 0, false); $unitArrays = $technology->getAllUnits($wref, false, 0, false);
$villageUpkeep = $getVillage['pop'] + $technology->getUpkeep($unitArrays, 0, $wref); $villageUpkeep = $getVillage['pop'] + $technology->getUpkeep($unitArrays, 0, $wref);