mirror of
https://github.com/GTNewHorizons/EnderCore.git
synced 2026-11-21 12:32:15 +00:00
Fix crash when ContainerEnder inv is null
This commit is contained in:
1 parent
4a6f3ee93d
commit
28d0627cf7
1 file changed
+5
-2
@@ -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<T extends IInventory> 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<T extends IInventory> 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
|
||||
|
||||
Reference in new issue
Block a user