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

fix: multi_query doesn't block next queries anymore

Browse Source
This commit is contained in:
Martin Ambrus
2017-10-27 19:34:19 +02:00
parent 1066fff9a2
commit 3200cf2c3c
3 changed files with 52 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Automation.php
+2
View File
@@ -5306,6 +5306,7 @@ $wallimg = "<img src=\"".GP_LOCATE."img/g/g3".$targettribe."Icon.gif\" height=\"
$time = time(); $time = time();
$q = "SELECT * FROM " . TB_PREFIX . "artefacts where type = 8 and active = 1 and lastupdate <= ".($time - 86400); $q = "SELECT * FROM " . TB_PREFIX . "artefacts where type = 8 and active = 1 and lastupdate <= ".($time - 86400);
$array = $database->query_return($q); $array = $database->query_return($q);
if ($array) {
foreach($array as $artefact) { foreach($array as $artefact) {
$kind = rand(1,7); $kind = rand(1,7);
while($kind == 6){ while($kind == 6){
@@ -5340,5 +5341,6 @@ $wallimg = "<img src=\"".GP_LOCATE."img/g/g3".$targettribe."Icon.gif\" height=\"
} }
} }
} }
}
$automation = new Automation; $automation = new Automation;
?> ?>
GameEngine/Database.php
+13 -8
View File
@@ -908,7 +908,7 @@ class MYSQLi_DB implements IDbConnection {
global $autoprefix; global $autoprefix;
if (is_array($wid)) { if (is_array($wid)) {
$wid = implode(',', $wid); $wid = '"'.implode(',', $wid).'"';
} else { } else {
$wid = (int) $wid; $wid = (int) $wid;
} }
@@ -918,6 +918,10 @@ class MYSQLi_DB implements IDbConnection {
$str = file_get_contents($autoprefix."var/db/datagen-oasis-troops-regen.sql"); $str = file_get_contents($autoprefix."var/db/datagen-oasis-troops-regen.sql");
$str = preg_replace(["'%PREFIX%'", "'%VILLAGEID%'", "'%NATURE_REG_TIME%'"], [TB_PREFIX, $wid, ($automation ? NATURE_REGTIME : -1)], $str); $str = preg_replace(["'%PREFIX%'", "'%VILLAGEID%'", "'%NATURE_REG_TIME%'"], [TB_PREFIX, $wid, ($automation ? NATURE_REGTIME : -1)], $str);
$result = $this->dblink->multi_query($str); $result = $this->dblink->multi_query($str);
// fetch results of the multi-query in order to allow subsequent query() and multi_query() calls to work
while (mysqli_more_results($this->dblink) && mysqli_next_result($this->dblink)) {;}
if (!$result) { if (!$result) {
return false; return false;
} }
@@ -3885,8 +3889,11 @@ class MYSQLi_DB implements IDbConnection {
$str = file_get_contents($autoprefix."var/db/struct.sql"); $str = file_get_contents($autoprefix."var/db/struct.sql");
$str = preg_replace("'%PREFIX%'", TB_PREFIX, $str); $str = preg_replace("'%PREFIX%'", TB_PREFIX, $str);
$result = $this->dblink->multi_query($str); $result = $this->dblink->multi_query($str);
// fetch results of the multi-query in order to allow subsequent query() and multi_query() calls to work
while (mysqli_more_results($this->dblink) && mysqli_next_result($this->dblink)) {;}
if (!$result) { if (!$result) {
echo mysqli_error($this->dblink); exit;
return false; return false;
} }
} catch (\Exception $e) { } catch (\Exception $e) {
@@ -3921,14 +3928,12 @@ class MYSQLi_DB implements IDbConnection {
$str = file_get_contents($autoprefix."var/db/datagen-world-data.sql"); $str = file_get_contents($autoprefix."var/db/datagen-world-data.sql");
$str = preg_replace(["'%PREFIX%'", "'%WORLDSIZE%'"], [TB_PREFIX, WORLD_MAX], $str); $str = preg_replace(["'%PREFIX%'", "'%WORLDSIZE%'"], [TB_PREFIX, WORLD_MAX], $str);
$result = $this->dblink->multi_query($str); $result = $this->dblink->multi_query($str);
// fetch results of the multi-query in order to allow subsequent query() and multi_query() calls to work
while (mysqli_more_results($this->dblink) && mysqli_next_result($this->dblink)) {;}
if (!$result) { if (!$result) {
return -1; return -1;
} else {
// we need to flush the result of our previous multi_query
// or the next multi_query in regenerateOasisUnits() will cause
// a "Commands out of sync; you can't run this command now" error
// more info: https://stackoverflow.com/a/27926561/467164
while (mysqli_next_result($this->dblink)) {;}
} }
$result = $this->regenerateOasisUnits(-1); $result = $this->regenerateOasisUnits(-1);
login.php
+4
View File
@@ -10,6 +10,10 @@
## ## ## ##
################################################################################# #################################################################################
if(!file_exists('var/installed')) {
header("Location: install/");
exit;
}
error_reporting(E_ALL); error_reporting(E_ALL);
include("GameEngine/Account.php"); include("GameEngine/Account.php");