fix: unable to determine attack type

iopietro · Nov 6, 2017 · 5a92945 · 5a92945
1 parent 9db31ff
commit 5a92945
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/GameEngine/Automation.php b/GameEngine/Automation.php
@@ -1042,7 +1042,7 @@ private function sendunitsComplete() {
         $time = time();
         $q = "
             SELECT
-                `from`, `to`, endtime, ref, ctar1, ctar2, spy, moveid,
+                `from`, `to`, endtime, ref, ctar1, ctar2, spy, moveid, attack_type,
                 t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11
             FROM
                 ".TB_PREFIX."movement,
@@ -1654,6 +1654,9 @@ private function sendunitsComplete() {
                     $totaldead_alldef_tmp[5] = $alldead['41']+$alldead['42']+$alldead['43']+$alldead['44']+$alldead['45']+$alldead['46']+$alldead['47']+$alldead['48']+$alldead['49']+$alldead['50'];
 
                     $totaldead_alldef = $totaldead_alldef_tmp[1]+$totaldead_alldef_tmp[2]+$totaldead_alldef_tmp[3]+$totaldead_alldef_tmp[4]+$totaldead_alldef_tmp[5]+$deadhero;
+                    if (!isset($totalattackdead)) {
+                        $totalattackdead = 0;
+                    }
                     $totalattackdead += $totaldead_alldef;
 
                     // Set units returning from attack
@@ -2971,7 +2974,7 @@ private function sendunitsComplete() {
                                 }
                                 $database->addMovement(6,$DefenderWref,$AttackerWref,$reference,$AttackArrivalTime,$endtime,1,0,0,0,0,$data['ref']);
                                 $totalstolengain=$steal[0]+$steal[1]+$steal[2]+$steal[3];
-                                $totalstolentaken=($totalstolentaken-($steal[0]+$steal[1]+$steal[2]+$steal[3]));
+                                $totalstolentaken=((isset($totalstolentaken) ? $totalstolentaken : 0)-($steal[0]+$steal[1]+$steal[2]+$steal[3]));
                                 $database->modifyPoints($from['owner'],'RR',$totalstolengain);
                                 $database->modifyPoints($to['owner'],'RR',$totalstolentaken);
                                 $database->modifyPointsAlly($targetally,'RR',$totalstolentaken );