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

Merge pull request #53 from CarloFalco/master

Browse Source 
Bug Fix
This commit is contained in:
Catalin Novgorodschi
2024-08-01 09:34:54 +03:00
committed by GitHub
parent a0640dc0b1 27c0a2f10b
commit 6046c74923
2 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Database.php
+20 -8
View File
@@ -705,14 +705,26 @@ class MYSQLi_DB implements IDbConnection {
$arg_list = func_get_args();
$ret = [];
for ($i = 0; $i < $numargs; $i++) {
if (is_string($arg_list[$i])) {
$arg_list[$i] = stripslashes($arg_list[$i]);
$res[] = mysqli_real_escape_string($this->dblink, $arg_list[$i]);
} else {
$res[] = $arg_list[$i];
}
}
for ($i = 0; $i < $numargs; $i++) {
if (is_array($arg_list[$i])) {
// array handling
$escaped_array = [];
foreach ($arg_list[$i] as $item) {
if (is_string($item)) {
$item = stripslashes($item);
$escaped_array[] = mysqli_real_escape_string($this->dblink, $item);
} else {
$escaped_array[] = (int)$item;
}
}
$res[] = $escaped_array;
} elseif (is_string($arg_list[$i])) {
$arg_list[$i] = stripslashes($arg_list[$i]);
$res[] = mysqli_real_escape_string($this->dblink, $arg_list[$i]);
} else {
$res[] = (int)$arg_list[$i];
}
}
return $res;
}
GameEngine/Generator.php
+3 -1
View File
@@ -118,7 +118,9 @@ class MyGenerator {
public function getBaseID($x, $y){
return ((WORLD_MAX - $y) * (WORLD_MAX * 2 + 1)) + (WORLD_MAX + $x + 1);
# broken -> return ((WORLD_MAX - $y) * (WORLD_MAX * 2 + 1)) + (WORLD_MAX + $x + 1);
# OK -> return ((WORLD_MAX - $y) * (WORLD_MAX * 2 + 1)) + (WORLD_MAX - $x + 1);
return ((WORLD_MAX - $y) * (WORLD_MAX * 2 + 1)) + (WORLD_MAX - $x + 1);
}
public function getMapCheck($wref){