From 5a9cb6705714d8c7a6ea23d9e0f026975a867084 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Mon, 28 Oct 2019 11:59:46 +0100 Subject: [PATCH] Fix crash in FilterUpdateMessage --- .../refinedstorage/network/FilterUpdateMessage.java | 3 ++- .../refinedstorage/util/PacketBufferUtils.java | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/raoulvdberge/refinedstorage/util/PacketBufferUtils.java diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/FilterUpdateMessage.java b/src/main/java/com/raoulvdberge/refinedstorage/network/FilterUpdateMessage.java index 7f9ed7a64..3566ba53e 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/FilterUpdateMessage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/FilterUpdateMessage.java @@ -2,6 +2,7 @@ package com.raoulvdberge.refinedstorage.network; import com.raoulvdberge.refinedstorage.container.FilterContainer; import com.raoulvdberge.refinedstorage.item.FilterItem; +import com.raoulvdberge.refinedstorage.util.PacketBufferUtils; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.network.PacketBuffer; import net.minecraftforge.fml.network.NetworkEvent; @@ -28,7 +29,7 @@ public class FilterUpdateMessage { buf.readInt(), buf.readInt(), buf.readBoolean(), - buf.readString(), + PacketBufferUtils.readString(buf), buf.readInt() ); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/util/PacketBufferUtils.java b/src/main/java/com/raoulvdberge/refinedstorage/util/PacketBufferUtils.java new file mode 100644 index 000000000..c6719337b --- /dev/null +++ b/src/main/java/com/raoulvdberge/refinedstorage/util/PacketBufferUtils.java @@ -0,0 +1,10 @@ +package com.raoulvdberge.refinedstorage.util; + +import net.minecraft.network.PacketBuffer; + +public class PacketBufferUtils { + // @Volatile: From PacketBuffer#readString, this exists because SideOnly + public static String readString(PacketBuffer buffer) { + return buffer.readString(32767); + } +}