From e616990397b1443739d6f61515f49e425e8e2c47 Mon Sep 17 00:00:00 2001
From: Ben Staddon <bs2609@users.noreply.github.com>
Date: Wed, 15 Nov 2017 21:05:17 +0000
Subject: [PATCH] Fix entity spawn messages not handling buffer correctly
 (#4524)

---
 .../fml/common/network/internal/EntitySpawnHandler.java       | 4 +++-
 .../fml/common/network/internal/FMLMessage.java               | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/net/minecraftforge/fml/common/network/internal/EntitySpawnHandler.java b/src/main/java/net/minecraftforge/fml/common/network/internal/EntitySpawnHandler.java
index 80822dee56..cc7dc3cbf5 100644
--- a/src/main/java/net/minecraftforge/fml/common/network/internal/EntitySpawnHandler.java
+++ b/src/main/java/net/minecraftforge/fml/common/network/internal/EntitySpawnHandler.java
@@ -60,7 +60,9 @@ public class EntitySpawnHandler extends SimpleChannelInboundHandler<FMLMessage.E
     {
         if (msg.getClass().equals(FMLMessage.EntitySpawnMessage.class))
         {
-            spawnEntity((FMLMessage.EntitySpawnMessage)msg);
+            FMLMessage.EntitySpawnMessage spawnMsg = (FMLMessage.EntitySpawnMessage) msg;
+            spawnEntity(spawnMsg);
+            spawnMsg.dataStream.release();
         }
     }
 
diff --git a/src/main/java/net/minecraftforge/fml/common/network/internal/FMLMessage.java b/src/main/java/net/minecraftforge/fml/common/network/internal/FMLMessage.java
index ba66f26b16..2c2ecc7ab5 100644
--- a/src/main/java/net/minecraftforge/fml/common/network/internal/FMLMessage.java
+++ b/src/main/java/net/minecraftforge/fml/common/network/internal/FMLMessage.java
@@ -244,7 +244,7 @@ public abstract class FMLMessage {
                 speedScaledY = dat.readInt() / 8000D;
                 speedScaledZ = dat.readInt() / 8000D;
             }
-            this.dataStream = dat;
+            this.dataStream = dat.retain();
         }
     }
     abstract void toBytes(ByteBuf buf);