From 4007bc764d646d7c5ef3ec1d06a7e69bcd5f4675 Mon Sep 17 00:00:00 2001 From: austin Date: Tue, 3 Sep 2024 22:37:34 -0400 Subject: [PATCH] prevent NPE on entity item state check --- docs/src/progress/renderertodo.md | 1 + src/main/java/electrosphere/entity/types/item/ItemUtils.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md index ba9d3981..37574ca1 100644 --- a/docs/src/progress/renderertodo.md +++ b/docs/src/progress/renderertodo.md @@ -677,6 +677,7 @@ Better jenkins documentation Include jenkins dockerfile in repo Better model for gameobjects Server synchronization of sprint tree +Fix potential bad path for item state lookup # TODO diff --git a/src/main/java/electrosphere/entity/types/item/ItemUtils.java b/src/main/java/electrosphere/entity/types/item/ItemUtils.java index 5f351709..711f3ddb 100644 --- a/src/main/java/electrosphere/entity/types/item/ItemUtils.java +++ b/src/main/java/electrosphere/entity/types/item/ItemUtils.java @@ -355,7 +355,7 @@ public class ItemUtils { * @return true if the item IS in an inventory container, otherwise false */ public static boolean itemIsInInventory(Entity item){ - return (boolean)item.getData(EntityDataStrings.ITEM_IS_IN_INVENTORY); + return item.containsKey(EntityDataStrings.ITEM_IS_IN_INVENTORY); } /**