From 74ab2c6048fbc8cdcdbf0da02c6fc1c8e0a148a4 Mon Sep 17 00:00:00 2001 From: Xander Date: Sat, 24 Mar 2018 16:28:16 +0800 Subject: [PATCH] ensure null inventory id is not sent. Fixes #4972 --- .../mekanism/common/tile/TileEntityMultiblock.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java index 9fc8e0a3c..5499b52f1 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java +++ b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java @@ -205,7 +205,9 @@ public abstract class TileEntityMultiblock> extend data.add(getSynchronizedData().volLength); getSynchronizedData().renderLocation.write(data); - data.add(getSynchronizedData().inventoryID); + data.add(getSynchronizedData().inventoryID != null);//boolean for if has inv id + if (getSynchronizedData().inventoryID != null) + data.add(getSynchronizedData().inventoryID); } else { data.add(false); @@ -239,7 +241,11 @@ public abstract class TileEntityMultiblock> extend getSynchronizedData().volLength = dataStream.readInt(); getSynchronizedData().renderLocation = Coord4D.read(dataStream); - getSynchronizedData().inventoryID = PacketHandler.readString(dataStream); + if (dataStream.readBoolean()){ + getSynchronizedData().inventoryID = PacketHandler.readString(dataStream); + } else { + getSynchronizedData().inventoryID = null; + } } } }