From 21969649a2e9c9bfa055343d411a10126dc2fef4 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Mon, 19 Dec 2016 17:12:06 +0100 Subject: [PATCH] Fix #1542 SidedInvWrapper used when facing is null --- src/main/java/forestry/core/tiles/TileForestry.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/forestry/core/tiles/TileForestry.java b/src/main/java/forestry/core/tiles/TileForestry.java index 107fb2ad4..2ae46723b 100644 --- a/src/main/java/forestry/core/tiles/TileForestry.java +++ b/src/main/java/forestry/core/tiles/TileForestry.java @@ -47,6 +47,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.items.CapabilityItemHandler; +import net.minecraftforge.items.wrapper.InvWrapper; import net.minecraftforge.items.wrapper.SidedInvWrapper; //@Optional.Interface(iface = "buildcraft.api.statements.ITriggerProvider", modid = "BuildCraftAPI|statements") @@ -336,8 +337,14 @@ public abstract class TileForestry extends TileEntity implements IStreamable, IE @Override public T getCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY && inventory != null){ - SidedInvWrapper sidedInvWrapper = new SidedInvWrapper(inventory, facing); - return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(sidedInvWrapper); + if(facing != null){ + SidedInvWrapper sidedInvWrapper = new SidedInvWrapper(inventory, facing); + return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(sidedInvWrapper); + }else{ + InvWrapper invWrapper = new InvWrapper(inventory); + return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(invWrapper); + } + } return super.getCapability(capability, facing); }