Return false when custom entity id is invalid

esoterictemplates · Aug 13, 2024 · d9a8fa4 · d9a8fa4
1 parent 63dd60a
commit d9a8fa4
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/main/java/net/slqmy/template_paper_plugin/custom_entity/AbstractCustomEntity.java b/src/main/java/net/slqmy/template_paper_plugin/custom_entity/AbstractCustomEntity.java
@@ -40,6 +40,10 @@ public boolean isEntity(Entity entity) {
       return false;
     }
 
-    return entityId == CustomEntity.valueOf(entity.getPersistentDataContainer().get(plugin.getCustomEntityIdKey(), PersistentDataType.STRING));
+    try {
+      return entityId == CustomEntity.valueOf(entity.getPersistentDataContainer().get(plugin.getCustomEntityIdKey(), PersistentDataType.STRING));
+    } catch (IllegalArgumentException | NullPointerException exception) {
+      return false;
+    }
   }
 }