From 60dcef2e299be4551307f196e30052b44ad08052 Mon Sep 17 00:00:00 2001
From: Kam <KamronGaming@gmail.com>
Date: Fri, 29 Mar 2024 01:35:07 -0400
Subject: [PATCH] Null check for Swing Event

---
 src/api                                                | 2 +-
 src/main/java/noppes/npcs/scripted/event/NpcEvent.java | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/api b/src/api
index 34d7c5049..2fc048b93 160000
--- a/src/api
+++ b/src/api
@@ -1 +1 @@
-Subproject commit 34d7c504964517ed8236dc24310dca62af8bd92e
+Subproject commit 2fc048b93e0f58ea59a4c7f943b7b46a98d42ee9
diff --git a/src/main/java/noppes/npcs/scripted/event/NpcEvent.java b/src/main/java/noppes/npcs/scripted/event/NpcEvent.java
index 41c03b803..98c51e6ba 100644
--- a/src/main/java/noppes/npcs/scripted/event/NpcEvent.java
+++ b/src/main/java/noppes/npcs/scripted/event/NpcEvent.java
@@ -227,7 +227,7 @@ public class NpcEvent extends CustomNPCsEvent implements INpcEvent {
 
         public SwingEvent(ICustomNpc npc, ItemStack itemStack) {
             super(npc);
-            this.itemStack = (IItemStack)NpcAPI.Instance().getIItemStack(itemStack);
+            this.itemStack = itemStack == null ? null : (IItemStack)NpcAPI.Instance().getIItemStack(itemStack);
         }
 
         public String getHookName() {
@@ -237,7 +237,6 @@ public class NpcEvent extends CustomNPCsEvent implements INpcEvent {
         /**
          * @return Returns the swung item
          */
-        @Override
         public IItemStack getItemStack() {
             return itemStack;
         }