From c4f04b158980a350cacd2547dbe7ba9cff34270e Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sat, 11 Mar 2017 15:53:43 -0800 Subject: [PATCH] Fix another null check crash (#1091) --- .../WayofTime/bloodmagic/api/soul/PlayerDemonWillHandler.java | 4 ++-- .../WayofTime/bloodmagic/util/handler/event/WillHandler.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/api/soul/PlayerDemonWillHandler.java b/src/main/java/WayofTime/bloodmagic/api/soul/PlayerDemonWillHandler.java index 12b7ebf2..34c2cfa9 100644 --- a/src/main/java/WayofTime/bloodmagic/api/soul/PlayerDemonWillHandler.java +++ b/src/main/java/WayofTime/bloodmagic/api/soul/PlayerDemonWillHandler.java @@ -135,8 +135,8 @@ public class PlayerDemonWillHandler */ public static ItemStack addDemonWill(EntityPlayer player, ItemStack willStack) { - if (willStack == null) - return null; + if (willStack.isEmpty()) + return ItemStack.EMPTY; NonNullList inventory = player.inventory.mainInventory; diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java index 95c79bff..9dd3d359 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java @@ -109,7 +109,7 @@ public class WillHandler { remainder = PlayerDemonWillHandler.addDemonWill(player, willStack); - if (remainder != null) + if (!remainder.isEmpty()) { EnumDemonWillType pickupType = ((IDemonWill) remainder.getItem()).getType(remainder); if (((IDemonWill) remainder.getItem()).getWill(pickupType, remainder) >= 0.0001)