From 8e0b81d8dce6610a2d0b2448865c0e9e67953fbb Mon Sep 17 00:00:00 2001 From: Martin Ambrus Date: Wed, 8 Nov 2017 09:32:42 +0100 Subject: [PATCH] fix: hero duplication on reinforcements with MySQL 5.7+ --- GameEngine/Automation.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GameEngine/Automation.php b/GameEngine/Automation.php index 929ec046..80a7e003 100755 --- a/GameEngine/Automation.php +++ b/GameEngine/Automation.php @@ -3487,9 +3487,9 @@ class Automation { }else{ $to_name="Oasis ".$database->getVillageField($to['conqured'],"name"); } - $database->addNotice($from['owner'],$from['wref'],$ownally,8,''.addslashes($from['name']).' reinforcement '.addslashes($to_name).'',$data_fail,$AttackArrivalTime); + $database->addNotice($from['owner'],$from['wref'],(isset($ownally) ? $ownally : 0),8,''.addslashes($from['name']).' reinforcement '.addslashes($to_name).'',$data_fail,(isset($AttackArrivalTime) ? $AttackArrivalTime : time())); if($from['owner'] != $to['owner']) { - $database->addNotice($to['owner'],$to['wref'],$targetally,8,''.addslashes($from['name']).' reinforcement '.addslashes($to_name).'',$data_fail,$AttackArrivalTime); + $database->addNotice($to['owner'],$to['wref'],(isset($targetally) ? $targetally : 0),8,''.addslashes($from['name']).' reinforcement '.addslashes($to_name).'',$data_fail,(isset($AttackArrivalTime) ? $AttackArrivalTime : time())); } //update status $database->setMovementProc($data['moveid']);