From 650596782648c64018ce7e600d4d74bbdeac43db Mon Sep 17 00:00:00 2001 From: asdflj <854865755@qq.com> Date: Tue, 28 Feb 2023 09:03:42 +0800 Subject: [PATCH] add fluid packet check --- .../glodblock/github/common/tile/TileFluidPacketDecoder.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/com/glodblock/github/common/tile/TileFluidPacketDecoder.java b/src/main/java/com/glodblock/github/common/tile/TileFluidPacketDecoder.java index cdabb33e..478201e8 100644 --- a/src/main/java/com/glodblock/github/common/tile/TileFluidPacketDecoder.java +++ b/src/main/java/com/glodblock/github/common/tile/TileFluidPacketDecoder.java @@ -182,6 +182,7 @@ public class TileFluidPacketDecoder extends AENetworkTile ItemStack fluidPacket = this.inventory.getStackInSlot(0); if (fluidPacket != null) { FluidStack fs = ItemFluidPacket.getFluidStack(fluidPacket); + if (fs == null) return null; if (fs.isFluidEqual(requestFluid)) { if (fs.amount > requestFluid.amount) { fs.amount -= requestFluid.amount; @@ -201,6 +202,7 @@ public class TileFluidPacketDecoder extends AENetworkTile ItemStack fluidPacket = this.inventory.getStackInSlot(0); if (fluidPacket != null) { FluidStack requestFluid = ItemFluidPacket.getFluidStack(fluidPacket); + if (requestFluid == null) return null; requestFluid.amount = maxDrain; return this.drain(requestFluid, doDrain); } @@ -224,6 +226,7 @@ public class TileFluidPacketDecoder extends AENetworkTile return new FluidTankInfo[0]; } else { FluidStack fs = ItemFluidPacket.getFluidStack(fluidPacket); + if (fs == null) return new FluidTankInfo[0]; return new FluidTankInfo[] { new FluidTankInfo(fs, fs.amount) }; } }