From f4db8d6db3ebca0d4b786edfca8f5f7ae5940faa Mon Sep 17 00:00:00 2001 From: Justin Aquadro Date: Tue, 15 Nov 2016 19:05:49 -0500 Subject: [PATCH] Fix possible crash when inserting/extracting from slave connected to AE2 storage bus --- build.gradle | 2 +- .../storagedrawers/block/tile/TileEntitySlave.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 1d39fa3..9823015 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript { apply plugin: 'forge' -version = "1.7.10-1.10.5" +version = "1.7.10-1.10.6" group= "com.jaquadro.minecraft.storagedrawers" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "StorageDrawers" diff --git a/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntitySlave.java b/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntitySlave.java index 8dba8de..afda931 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntitySlave.java +++ b/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntitySlave.java @@ -15,6 +15,8 @@ import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.Constants; +import java.util.ArrayList; + public class TileEntitySlave extends TileEntity implements IDrawerGroup, IPriorityGroup, ISmartGroup, ISidedInventory { private BlockCoord controllerCoord; @@ -261,7 +263,7 @@ public class TileEntitySlave extends TileEntity implements IDrawerGroup, IPriori public Iterable enumerateDrawersForInsertion (ItemStack stack, boolean strict) { TileEntityController controller = getController(); if (controller == null || !controller.isValidSlave(selfCoord)) - return null; + return new ArrayList(); return controller.enumerateDrawersForInsertion(stack, strict); } @@ -270,7 +272,7 @@ public class TileEntitySlave extends TileEntity implements IDrawerGroup, IPriori public Iterable enumerateDrawersForExtraction (ItemStack stack, boolean strict) { TileEntityController controller = getController(); if (controller == null || !controller.isValidSlave(selfCoord)) - return null; + return new ArrayList(); return controller.enumerateDrawersForExtraction(stack, strict); }