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

fix: hero training and revive got messed up

Browse Source
This commit is contained in:
Martin Ambrus
2017-11-22 21:38:57 +01:00
parent 96663574ad
commit c06c62ba6a
4 changed files with 49 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Session.php
+8 -3
View File
@@ -208,7 +208,9 @@ class Session {
global $database,$link;
$villageIDs = implode(', ', $this->villages);
$hero = mysqli_fetch_array(
// check if hero unit for this player is present anywhere on the map
$heroUnitRegisters = mysqli_fetch_array(
mysqli_query($database->dblink, '
SELECT
IFNULL((SELECT SUM(hero) from '.TB_PREFIX.'enforcement where `from` IN('.$villageIDs.')), 0) +
@@ -220,9 +222,12 @@ class Session {
MYSQLI_ASSOC
)['herocount'];
$isHeroElsewhere = $database->getHeroDeadReviveOrInTraining($this->uid);
// check if the actual hero is alive or being trained/revived into a living state
$isHeroLivingOrRaising = $database->getHeroDeadReviveOrInTraining($this->uid);
if($isHeroElsewhere && !$hero) {
// if he doesn't register anywhere on the map but is marked as alive,
// we need to kill him
if(!$heroUnitRegisters && $isHeroLivingOrRaising) {
$database->KillMyHero($this->uid);
}
}