fixed entity removed before shoot task complete error

UQcsse3200 · Sep 15, 2023 · b97baee · b97baee
1 parent 3b8cafe
commit b97baee
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/source/core/src/main/com/csse3200/game/components/TouchAttackComponent.java b/source/core/src/main/com/csse3200/game/components/TouchAttackComponent.java
@@ -129,8 +129,17 @@ private void onCollisionEnd(Fixture me, Fixture other) {
     }
   }
 
+  /**
+   * Choose the weapon to use against the given fixture.
+   *
+   * If the fixture has been removed (died) return null, else return the weapon to use.
+   * */
   public Weapon chooseWeapon(Fixture other) {
-    Entity target = ((BodyUserData) other.getBody().getUserData()).entity;
+    BodyUserData data = ((BodyUserData) other.getBody().getUserData());
+    if (data == null) {
+      return null;
+    }
+    Entity target = data.entity;
     Weapon weapon = null;
     if (target.getComponent(CombatStatsComponent.class) != null) {
       weapon = combatStats.getWeapon(target);