From 0f6e46159fd525c2cf6c869618b682a7ba4f9992 Mon Sep 17 00:00:00 2001
From: austin <austin@austinhoover.net>
Date: Tue, 3 Sep 2024 23:04:46 -0400
Subject: [PATCH] ItemUtils NPE bug fix

---
 docs/src/progress/renderertodo.md             |  1 +
 .../entity/types/item/ItemUtils.java          |  3 +++
 .../entity/types/item/ItemUtilsUnitTests.java | 20 +++++++++++++++++++
 3 files changed, 24 insertions(+)
 create mode 100644 src/test/java/electrosphere/entity/types/item/ItemUtilsUnitTests.java

diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md
index 37574ca1..a3aff0d9 100644
--- a/docs/src/progress/renderertodo.md
+++ b/docs/src/progress/renderertodo.md
@@ -678,6 +678,7 @@ Include jenkins dockerfile in repo
 Better model for gameobjects
 Server synchronization of sprint tree
 Fix potential bad path for item state lookup
+Fix ItemUtils NPE bug + unit test
 
 
 # TODO
diff --git a/src/main/java/electrosphere/entity/types/item/ItemUtils.java b/src/main/java/electrosphere/entity/types/item/ItemUtils.java
index 711f3ddb..3bdea071 100644
--- a/src/main/java/electrosphere/entity/types/item/ItemUtils.java
+++ b/src/main/java/electrosphere/entity/types/item/ItemUtils.java
@@ -290,6 +290,9 @@ public class ItemUtils {
      * @return true if it is an item, false otherwise
      */
     public static boolean isItem(Entity e){
+        if(e == null){
+            return false;
+        }
         if(!e.containsKey(EntityDataStrings.ENTITY_TYPE)){
             return false;
         }
diff --git a/src/test/java/electrosphere/entity/types/item/ItemUtilsUnitTests.java b/src/test/java/electrosphere/entity/types/item/ItemUtilsUnitTests.java
new file mode 100644
index 00000000..ec451529
--- /dev/null
+++ b/src/test/java/electrosphere/entity/types/item/ItemUtilsUnitTests.java
@@ -0,0 +1,20 @@
+package electrosphere.entity.types.item;
+
+import org.junit.jupiter.api.Assertions;
+
+import annotations.FastTest;
+import annotations.UnitTest;
+
+/**
+ * Unit tests for item utils
+ */
+public class ItemUtilsUnitTests {
+    
+    @UnitTest
+    @FastTest
+    public void isItem_NullEntity_False(){
+        boolean result = ItemUtils.isItem(null);
+        Assertions.assertEquals(false, result);
+    }
+
+}