From 36a42333cb3fa2e640dd37f7b9f3ee75399ce3ee Mon Sep 17 00:00:00 2001
From: Danial <admin@redsparr0w.com>
Date: Thu, 7 Oct 2021 15:59:54 +1300
Subject: [PATCH] Update LoadCannon.java

---
 src/main/java/ParaScript/strategies/LoadCannon.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/ParaScript/strategies/LoadCannon.java b/src/main/java/ParaScript/strategies/LoadCannon.java
index c078cf6..64be5fc 100644
--- a/src/main/java/ParaScript/strategies/LoadCannon.java
+++ b/src/main/java/ParaScript/strategies/LoadCannon.java
@@ -7,11 +7,8 @@ import org.rev317.min.api.methods.Game;
 import org.rev317.min.api.methods.Inventory;
 import org.rev317.min.api.methods.Items;
 import org.rev317.min.api.methods.SceneObjects;
-import org.rev317.min.api.wrappers.Item;
 import org.rev317.min.api.wrappers.SceneObject;
 
-import java.util.Date;
-
 public class LoadCannon implements Strategy {
     private SceneObject cannon;
     private long nextFill = System.currentTimeMillis() + 20000;
@@ -23,6 +20,7 @@ public class LoadCannon implements Strategy {
         if (Variables.running
                 && Variables.load_cannon
                 && cannon != null
+                && hasCannonBalls()
                 && nextFill <= System.currentTimeMillis()
         ) {
             Variables.setStatus("filling cannon");
@@ -48,4 +46,9 @@ public class LoadCannon implements Strategy {
         }
         return null;
     }
+
+    private boolean hasCannonBalls(){
+        // Make sure we have cannon balls
+        return Inventory.getItem(2 + 1) != null;
+    }
 }