From fe9d6960c7485fc7fbd537e25b9289d64930eaed Mon Sep 17 00:00:00 2001 From: Zrips Date: Sun, 14 Oct 2018 12:59:39 +0300 Subject: [PATCH] Correct way in checking if entity alive --- src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java b/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java index cddf3980..82ea2ea6 100644 --- a/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java +++ b/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java @@ -589,14 +589,11 @@ public class ItemManager { } public boolean isAlive() { - if (version.isLower(Version.v1_9_R1)) - return true; // TODO: Fixing NullPointerException - - return getType().isAlive(); + return getType() == null ? false : getType().isAlive(); } public boolean isSpawnable() { - return getType().isSpawnable(); + return getType() == null ? false : getType().isSpawnable(); } public static String getRealNameByType(EntityType type) {