From 4feb95131cab8dd6dbb76c064c563c8b74c812fa Mon Sep 17 00:00:00 2001 From: FatBoy-DOTC Date: Fri, 31 May 2024 18:34:27 -0500 Subject: [PATCH] early exit for pets attacking a null target --- src/engine/gameManager/CombatManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/engine/gameManager/CombatManager.java b/src/engine/gameManager/CombatManager.java index 15f6173a..91410abd 100644 --- a/src/engine/gameManager/CombatManager.java +++ b/src/engine/gameManager/CombatManager.java @@ -124,7 +124,7 @@ public enum CombatManager { return; //check if this slot is on attack timer, if timer has passed clear it, else early exit - if(attacker.getTimers().containsKey("Attack"+slot.name())) + if(attacker.getTimers() != null && attacker.getTimers().containsKey("Attack"+slot.name())) if(attacker.getTimers().get("Attack"+slot.name()).timeToExecutionLeft() <= 0) attacker.getTimers().remove("Attack"+slot.name()); else