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

Merge pull request #483 from AL-Kateb/master

Browse Source 
Fix for issue #462
This commit is contained in:
Shadow
2018-01-23 07:59:40 +02:00
committed by GitHub
parent 1c04e39020 5b1d7a300b
commit c662b49c9d
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Database.php
+1 -1
View File
@@ -3317,7 +3317,7 @@ class MYSQLi_DB implements IDbConnection {
crop = IF(crop $sign $crop < 0, 0, IF(crop $sign $crop > maxcrop, maxcrop, crop $sign $crop))
WHERE
wref = " . $vid ;
return mysqli_query( $this->dblink, $q);
}
GameEngine/Technology.php
+1 -1
View File
@@ -191,7 +191,7 @@ class Technology {
global $village,$$unit,$database;
$unitarray = $$unit;
$res = $database->getVillage($village->wid);
$res = $database->getVillage($village->wid, 0, false);
if ($res['wood'] > $res['maxstore']){$res['wood'] = $res['maxstore'];}
if ($res['clay'] > $res['maxstore']){$res['clay'] = $res['maxstore'];}
if ($res['iron'] > $res['maxstore']){$res['iron'] = $res['maxstore'];}
Templates/Build/22_2.tpl
-1
View File
@@ -20,7 +20,6 @@ for($i=12;$i<=19;$i++) {
//-- If available resources combined are not enough, remove NPC button
$total_required = (int)(${'r'.$i}['wood'] + ${'r'.$i}['clay'] + ${'r'.$i}['iron'] + ${'r'.$i}['crop']);
echo "Total required is $total_required and total available is " . $village->atotal;
if($session->userinfo['gold'] >= 3 && $building->getTypeLevel(17) >= 1 && $village->atotal >= $total_required) {
echo "|<a href=\"build.php?gid=17&t=3&r1=".${'r'.$i}['wood']."&r2=".${'r'.$i}['clay']."&r3=".${'r'.$i}['iron']."&r4=".${'r'.$i}['crop']."\" title=\"NPC trade\"><img class=\"npc\" src=\"img/x.gif\" alt=\"NPC trade\" title=\"NPC trade\" /></a>";
}