Merge pull request #76 from mikeygio10/patch-2

Update CombatEngine.php
BlockHorizons · Mar 30, 2020 · a9bee27 · a9bee27
2 parents 3937e7c + 88ae426
commit a9bee27
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/factions/engine/CombatEngine.php b/src/factions/engine/CombatEngine.php
@@ -119,6 +119,9 @@ public static function canCombatDamageHappen(EntityDamageByEntityEvent $event, $
         $mattacker = $attacker instanceof Player ? Members::get($attacker) : null;
         $mdefender = Members::get($victim);
         $defendFaction = $mdefender->getFaction();
+        if ($mattacker == null) {
+            return false;
+        }        
         $attackFaction = $mattacker->getFaction(); # ERROR
 
         if ($mattacker !== null && $mdefender->isOverriding() || $mattacker->isOverriding()) return true;