xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-08-21 02:30:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: too much gold for instant build & research

Browse Source 
Fixes #257
This commit is contained in:
Martin Ambrus
2017-11-02 13:11:19 +01:00
parent cda7548cb1
commit 945bb2f8c7
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Admin/database.php
+1 -1
View File
@@ -373,7 +373,7 @@ class adm_DB {
$q = "DELETE FROM ".TB_PREFIX."vdata WHERE `wref` = $wref"; $q = "DELETE FROM ".TB_PREFIX."vdata WHERE `wref` = $wref";
mysqli_query($this->connection, $q); mysqli_query($this->connection, $q);
if (mysqli_affected_rows()>0) { if (mysqli_affected_rows($this->connection)>0) {
$q = "UPDATE ".TB_PREFIX."wdata set occupied = 0 where id = $wref"; $q = "UPDATE ".TB_PREFIX."wdata set occupied = 0 where id = $wref";
mysqli_query($this->connection, $q); mysqli_query($this->connection, $q);
GameEngine/Automation.php
+1 -1
View File
@@ -3150,7 +3150,7 @@ class Automation {
$q = "DELETE FROM ".TB_PREFIX."vdata WHERE `wref` = $wref"; $q = "DELETE FROM ".TB_PREFIX."vdata WHERE `wref` = $wref";
$database->query($q); $database->query($q);
if (mysqli_affected_rows()>0) { if (mysqli_affected_rows($database->dblink)>0) {
$q = "UPDATE ".TB_PREFIX."wdata set occupied = 0 where id = $wref"; $q = "UPDATE ".TB_PREFIX."wdata set occupied = 0 where id = $wref";
$database->query($q); $database->query($q);
GameEngine/Building.php
+5 -5
View File
@@ -816,15 +816,15 @@ class Building {
} }
if($finish != 2){ if($finish != 2){
// only decrease gold if we didn't already do it for the building phase // only decrease gold if we didn't already do it for the building phase
if (!isset($newgold)) {
$newgold = $session->gold-2;
$database->updateUserField($session->uid, "gold", $newgold, 1);
}
$demolition=$database->finishDemolition($village->wid); $demolition=$database->finishDemolition($village->wid);
$tech=$technology->finishTech(); $tech=$technology->finishTech();
if ($finish==1 || $demolition>0 || $tech>0) { if ($finish==1 || $demolition>0 || $tech>0) {
$logging->goldFinLog($village->wid); $logging->goldFinLog($village->wid);
$database->modifyGold($session->uid,2,0); if (!isset($newgold)) {
$session->gold = $session->gold - 2;
$newgold = $session->gold;
$database->updateUserField($session->uid, "gold", $newgold, 1);
}
} }
$stillbuildingarray = $database->getJobs($village->wid); $stillbuildingarray = $database->getJobs($village->wid);
if(count($stillbuildingarray) == 1) { if(count($stillbuildingarray) == 1) {
GameEngine/Database.php
+1 -1
View File
@@ -2867,7 +2867,7 @@ class MYSQLi_DB implements IDbConnection {
$q = "UPDATE " . TB_PREFIX . "demolition SET timetofinish=" . time() . " WHERE vref=" . $wid; $q = "UPDATE " . TB_PREFIX . "demolition SET timetofinish=" . time() . " WHERE vref=" . $wid;
$result= mysqli_query($this->dblink,$q); $result= mysqli_query($this->dblink,$q);
return mysqli_affected_rows(); return mysqli_affected_rows($this->dblink);
} }
function delDemolition($wid, $checkEmbassy = false) { function delDemolition($wid, $checkEmbassy = false) {
GameEngine/Technology.php
+1 -1
View File
@@ -765,7 +765,7 @@ private function trainUnit($unit,$amt,$great=false) {
global $database,$village; global $database,$village;
$q = "UPDATE ".TB_PREFIX."research SET timestamp=".(time()-1)." WHERE vref = ".(int) $village->wid; $q = "UPDATE ".TB_PREFIX."research SET timestamp=".(time()-1)." WHERE vref = ".(int) $village->wid;
$result = $database->query($q); $result = $database->query($q);
return mysqli_affected_rows(); return mysqli_affected_rows($database->dblink);
} }
public function calculateAvaliable($id,$resarray=array()) { public function calculateAvaliable($id,$resarray=array()) {