From 16c3fae45d303b3ceb575b769075a63f1c6eed0d Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Mon, 18 Dec 2017 20:25:21 +0100 Subject: [PATCH] Fix #1918 Fix #1912 packet handler issue with latest Forge (14.23.1.2574+) --- gradle.properties | 2 +- src/main/java/forestry/core/network/PacketHandler.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 66ed443a6..ae40dcc03 100755 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ mcversion=1.12.2 -forgeversion=14.23.0.2501 +forgeversion=14.23.1.2577 mcp_mappings=snapshot_20170918 curse_project_id=59751 diff --git a/src/main/java/forestry/core/network/PacketHandler.java b/src/main/java/forestry/core/network/PacketHandler.java index d59a9cf5b..7ca2e690b 100755 --- a/src/main/java/forestry/core/network/PacketHandler.java +++ b/src/main/java/forestry/core/network/PacketHandler.java @@ -69,11 +69,13 @@ public class PacketHandler { @SideOnly(Side.CLIENT) private static void checkThreadAndEnqueue(final IForestryPacketHandlerClient packet, final PacketBufferForestry data, IThreadListener threadListener) { if (!threadListener.isCallingFromMinecraftThread()) { + data.retain(); threadListener.addScheduledTask(() -> { try { EntityPlayer player = Minecraft.getMinecraft().player; Preconditions.checkNotNull(player, "Tried to send data to client before the player exists."); packet.onPacketData(data, player); + data.release(); } catch (IOException e) { Log.error("Network Error", e); } @@ -83,9 +85,11 @@ public class PacketHandler { private static void checkThreadAndEnqueue(final IForestryPacketHandlerServer packet, final PacketBufferForestry data, final EntityPlayerMP player, IThreadListener threadListener) { if (!threadListener.isCallingFromMinecraftThread()) { + data.retain(); threadListener.addScheduledTask(() -> { try { packet.onPacketData(data, player); + data.release(); } catch (IOException e) { Log.error("Network Error", e); }