lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix another null check crash (#1091)

Browse source
This commit is contained in:
Nicholas Ignoffo 2017-03-11 15:53:43 -08:00
parent 7c8e9b6d8d
commit c4f04b1589
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/WayofTime/bloodmagic/api/soul/PlayerDemonWillHandler.java
View file

@ -135,8 +135,8 @@ public class PlayerDemonWillHandler
*/ */
public static ItemStack addDemonWill(EntityPlayer player, ItemStack willStack) public static ItemStack addDemonWill(EntityPlayer player, ItemStack willStack)
{ {
if (willStack == null) if (willStack.isEmpty())
return null; return ItemStack.EMPTY;
NonNullList<ItemStack> inventory = player.inventory.mainInventory; NonNullList<ItemStack> inventory = player.inventory.mainInventory;

2
src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java
View file

@ -109,7 +109,7 @@ public class WillHandler
{ {
remainder = PlayerDemonWillHandler.addDemonWill(player, willStack); remainder = PlayerDemonWillHandler.addDemonWill(player, willStack);
if (remainder != null) if (!remainder.isEmpty())
{ {
EnumDemonWillType pickupType = ((IDemonWill) remainder.getItem()).getType(remainder); EnumDemonWillType pickupType = ((IDemonWill) remainder.getItem()).getType(remainder);
if (((IDemonWill) remainder.getItem()).getWill(pickupType, remainder) >= 0.0001) if (((IDemonWill) remainder.getItem()).getWill(pickupType, remainder) >= 0.0001)