From 28d0627cf7118b392b3deeb4289f9f3c236ce8ba Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Wed, 2 Sep 2015 15:58:49 -0400 Subject: [PATCH] Fix crash when ContainerEnder inv is null --- src/main/java/com/enderio/core/common/ContainerEnder.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/enderio/core/common/ContainerEnder.java b/src/main/java/com/enderio/core/common/ContainerEnder.java index b6c44cd..5045c83 100644 --- a/src/main/java/com/enderio/core/common/ContainerEnder.java +++ b/src/main/java/com/enderio/core/common/ContainerEnder.java @@ -4,6 +4,8 @@ import java.awt.Point; import java.util.HashMap; import java.util.Map; +import javax.annotation.Nullable; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -23,7 +25,7 @@ public class ContainerEnder extends Container { private T inv; private InventoryPlayer playerInv; - public ContainerEnder(InventoryPlayer playerInv, T inv) { + public ContainerEnder(InventoryPlayer playerInv, @Nullable T inv) { this.inv = inv; this.playerInv = playerInv; @@ -65,13 +67,14 @@ public class ContainerEnder extends Container { return new Point(12, 60); } + @Nullable public T getInv() { return inv; } @Override public boolean canInteractWith(EntityPlayer player) { - return getInv().isUseableByPlayer(player); + return getInv() == null ? true : getInv().isUseableByPlayer(player); } @Override