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

conflict from resolution from TPLinux

Browse Source
This commit is contained in:
Martin Ambrus
2017-08-28 13:54:46 +02:00
parent 652ccc3522 88b1cacc79
commit c7c01dd424
14 changed files with 238 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Automation.php
+1 -1
View File
@@ -35,7 +35,7 @@ class Automation {
$isThere = mysql_num_rows($q);
if($isThere > 0)
{
header('Location: /winner.php');
header('Location: winner.php');
}else{
## there is no winner
}
GameEngine/Building.php
+7 -4
View File
@@ -7,7 +7,7 @@
## Version: 22.06.2015 ##
## Filename Building.php ##
## Developed by: Mr.php , Advocaite , brainiacX , yi12345 , Shadow , ronix ##
## Fixed by: Shadow - STARVATION , HERO FIXED COMPL. ##
## Fixed by: Shadow - STARVATION , HERO FIXED COMPL., TPLinux ##
## Fixed by: InCube - double troops ##
## License: TravianZ Project ##
## Copyright: TravianZ (c) 2010-2015. All rights reserved. ##
@@ -97,7 +97,7 @@ class Building {
}
}
if(isset($get['buildingFinish']) && $session->plus) {
if($session->gold >= 2 && $session->sit == 0) {
if(intval($session->gold) >= 2 && $session->sit == 0) {
$this->finishAll();
}
}
@@ -278,7 +278,7 @@ class Building {
return $build;
}
private function loadBuilding() {
public function loadBuilding() {
global $database,$village,$session;
$this->buildArray = $database->getJobs($village->wid);
$this->allocated = count($this->buildArray);
@@ -301,8 +301,11 @@ class Building {
}
}
}
// echo var_dump($this->buildArray);
$this->NewBuilding = true;
}
}else{
$this->NewBuilding = false;
}
}
private function removeBuilding($d) {