From e6ae028c7fa72f98d1b11ec33abc60beb08a489b Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Wed, 29 Oct 2014 14:28:31 +0800 Subject: [PATCH] #1170 Dimensional Transceiver liquid related crash --- ReleaseNotes.txt | 10 +++++++ .../machine/transceiver/TileTransceiver.java | 30 ++++++++++++------- 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 68707560..eeb6acc5 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,13 @@ +------------------------------------------------------ +Version 2.1.8 +------------------------------------------------------ + +Changes +- #1167 Improved NEI handlers (Tonius) + +Bugs +- #1170 Dimensional Transceiver liquid related crash + ------------------------------------------------------ Version 2.1.7 ------------------------------------------------------ diff --git a/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java b/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java index ca97b76d..5a26cf0f 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java @@ -53,9 +53,11 @@ public class TileTransceiver extends AbstractPoweredTaskEntity implements IFluid private Map neighbourFluidHandlers = null; private PowerDistributor powerDistributor; - + private final EnderRailController railController; + private boolean inFluidFill = false; + public TileTransceiver() { super(new SlotDefinition(8, 8, 0)); for (ChannelType type : ChannelType.values()) { @@ -64,8 +66,8 @@ public class TileTransceiver extends AbstractPoweredTaskEntity implements IFluid } currentTask = new ContinuousTask(Config.transceiverUpkeepCostRF); railController = new EnderRailController(this); - } - + } + public EnderRailController getRailController() { return railController; } @@ -233,10 +235,10 @@ public class TileTransceiver extends AbstractPoweredTaskEntity implements IFluid super.writeCustomNBT(nbtRoot); railController.writeToNBT(nbtRoot); } - + @Override public void readCommon(NBTTagCompound nbtRoot) { - super.readCommon(nbtRoot); + super.readCommon(nbtRoot); readChannels(nbtRoot, sendChannels, "sendChannels"); readChannels(nbtRoot, recieveChannels, "recieveChannels"); } @@ -264,7 +266,7 @@ public class TileTransceiver extends AbstractPoweredTaskEntity implements IFluid @Override public void writeCommon(NBTTagCompound nbtRoot) { super.writeCommon(nbtRoot); - + NBTTagList channelTags = createTagList(sendChannels); nbtRoot.setTag("sendChannels", channelTags); @@ -380,13 +382,21 @@ public class TileTransceiver extends AbstractPoweredTaskEntity implements IFluid @Override public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - if(getSendChannels(ChannelType.FLUID).isEmpty() || !redstoneCheckPassed || !getIoMode(from).canRecieveInput()) { - return 0; + try { + inFluidFill = true; + if(getSendChannels(ChannelType.FLUID).isEmpty() || !redstoneCheckPassed || !getIoMode(from).canRecieveInput()) { + return 0; + } + return ServerChannelRegister.instance.fill(this, getSendChannels(ChannelType.FLUID), resource, doFill); + } finally { + inFluidFill = false; } - return ServerChannelRegister.instance.fill(this, getSendChannels(ChannelType.FLUID), resource, doFill); } public int recieveFluid(List channels, FluidStack resource, boolean doFill) { + if(inFluidFill) { + return 0; + } if(!hasRecieveChannel(channels, ChannelType.FLUID) || !redstoneCheckPassed) { return 0; } @@ -482,7 +492,7 @@ public class TileTransceiver extends AbstractPoweredTaskEntity implements IFluid } } } - } + } return super.canInsertItem(slot, itemstack, j); }