xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-06-28 00:24:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: getUnit() can take multiple IDs at once

Browse Source 
#313
This commit is contained in:
Martin Ambrus
2017-11-17 20:23:01 +01:00
parent d17d1f9b32
commit db87ce88a7
2 changed files with 44 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Automation.php
+12 -1
View File
@@ -570,6 +570,7 @@ class Automation {
$database->query($q);
}
}
if(file_exists("GameEngine/Prevention/culturepoints.txt")) {
unlink("GameEngine/Prevention/culturepoints.txt");
}
@@ -4272,6 +4273,16 @@ class Automation {
global $database,$hero_levels;
$harray = $database->getHero();
if(!empty($harray)){
// first of all, prepare all unit data at once for these heroes
$heroVillageIDs = [];
foreach($harray as $hdata) {
$heroVillageIDs[] = $hdata['wref'];
}
// load data for those prepared IDs
$unitData = $database->getUnit($heroVillageIDs);
// now do the math
foreach($harray as $hdata){
if((time()-$hdata['lastupdate'])>=1){
if($hdata['health']<100 and $hdata['health']>0){
@@ -4300,7 +4311,7 @@ class Automation {
}
}
}
$villunits = $database->getUnit($hdata['wref']);
$villunits = $unitData[$hdata['wref']];
if($villunits['hero'] == 0 && $hdata['trainingtime'] < time() && $hdata['inrevive'] == 1){
mysqli_query($GLOBALS['link'],"UPDATE " . TB_PREFIX . "units SET hero = 1 WHERE vref = ".(int) $hdata['wref']."");
mysqli_query($GLOBALS['link'],"UPDATE ".TB_PREFIX."hero SET `dead` = '0', `inrevive` = '0', `health` = '100', `lastupdate` = ".(int) $hdata['trainingtime']." WHERE `heroid` = ".(int) $hdata['heroid']);
GameEngine/Database.php
+32 -6
View File
@@ -5056,7 +5056,7 @@ class MYSQLi_DB implements IDbConnection {
}
function getUnit($vid, $use_cache = true) {
list($vid) = $this->escape_input((int) $vid);
$vid = (int) $vid;
// first of all, check if we should be using cache and whether the field
// required is already cached
@@ -5064,15 +5064,41 @@ class MYSQLi_DB implements IDbConnection {
return $cachedValue;
}
$q = "SELECT * from " . TB_PREFIX . "units where vref = $vid";
if (!is_array($vid)) {
$vid = [$vid];
}
$q = "SELECT * from " . TB_PREFIX . "units where vref IN(".implode(', ', $vid).")";
$result = mysqli_query($this->dblink,$q);
if (!empty($result)) {
self::$unitsCache[$vid] = mysqli_fetch_assoc($result);
$returnArray = [];
$resCount = 0;
$vidCount = count($vid);
if (!empty($result) && ($resCount = mysqli_num_rows($result)) && $resCount) {
while ($row = mysqli_fetch_assoc($result)) {
self::$unitsCache[$row['vref']] = $row;
$returnArray[$row['vref']] = $row;
}
} else {
self::$unitsCache[$vid] = null;
// fill everything with nulls
foreach ($vid as $id) {
self::$unitsCache[$id] = null;
$returnArray[$id] = null;
}
}
return self::$unitsCache[$vid];
// check if we're not missing any return values
if ($vidCount != $resCount) {
// fill-in the gaps, as it would mean some of the IDs we got were not found
// (which is super-strange, but it's still a mathematical possibility)
foreach ($vid as $id) {
if (!isset($returnArray[$id])) {
$returnArray[$id] = null;
}
}
}
return ($vidCount > 1 ? $returnArray : reset($returnArray));
}
// no need to cache this method