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

fix: rat reinforcement does not arrive due to a wrong reinfs check

Browse Source 
#366
This commit is contained in:
Martin Ambrus
2017-11-22 11:47:17 +01:00
parent 02dd832932
commit 65a62becc2
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Automation.php
+1 -1
View File
@@ -3438,7 +3438,7 @@ class Automation {
$DefenderID = $database->getVillageField($data['to'],"owner");
if (isset($AttackerID) && $session->uid==$AttackerID || $session->uid==$DefenderID) $reload=true;
$database->addEnforce($data);
$reinf = $database->getEnforce($data['to'],$data['from']);
$reinf = $database->getEnforce($data['from'],$data['to']);
$database->modifyEnforce($reinf['id'],31,1,1);
$data_fail = '0,0,4,1,0,0,0,0,0,0,0,0,0,0';
$database->addNotice($to['owner'],$to['wref'],(isset($targetally) ? $targetally : 0),8,'village of the elders reinforcement '.addslashes($to['name']).'',$data_fail,$AttackArrivalTime);
GameEngine/Database.php
+5 -5
View File
@@ -6094,7 +6094,7 @@ References: User ID/Message ID, Mode
}
}
return ($array_passed ? self::$villageReinforcementsCache : self::$villageReinforcementsCache[$vid[0].$from[0]]);
return ($array_passed ? self::$villageFromReinforcementsCache : self::$villageFromReinforcementsCache[$vid[0].$from[0]]);
}
function getOasisEnforce($ref, $mode=0, $use_cache = true) {
@@ -6211,7 +6211,7 @@ References: User ID/Message ID, Mode
$modes = [];
for($i = $start; $i <= $end; $i++) {
$units[] = $i;
$units[] = ($i < 0 ? 0 : $i);
$amounts[] = $data['t' . $j . ''];
$modes[] = 1;
$j++;
@@ -6237,7 +6237,7 @@ References: User ID/Message ID, Mode
$start2 = ($tribe - 1) * 10 + 1;
$start3 = ($tribe - 1) * 10;
if($start3 == 0){
$start3 = "";
$start3 = "";
}
$end2 = ($tribe * 10);
//add unit
@@ -6248,11 +6248,11 @@ References: User ID/Message ID, Mode
$modes = [];
for($i = $start; $i <= $end; $i++) {
$units[] = $i;
$units[] = ($i < 0 ? 0 : $i);
$amounts[] = $data['t' . $j . ''];
$modes[] = 1;
$units[] = $i;
$units[] = ($i < 0 ? 0 : $i);
$amounts[] = ${'dead'.$j};
$modes[] = 0;