src/main/java/net/minecraft/server/NetworkManager.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
index 1b080c7..e02cc9c 100644
--- a/src/main/java/net/minecraft/server/NetworkManager.java
+++ b/src/main/java/net/minecraft/server/NetworkManager.java
@@ -80,6 +80,14 @@ public class NetworkManager extends SimpleChannelInboundHandler {

     protected void a(ChannelHandlerContext channelhandlercontext, Packet packet) {
         if (this.m.isOpen()) {
+            // CraftBukkit start - Process conversation input on main thread
+            if (packet instanceof PacketPlayInChat && this.o instanceof PlayerConnection) {
+                if (((PlayerConnection) this.o).player.getBukkitEntity().isConversing()) {
+                    this.k.add(packet);
+                    return;
+                }
+            }
+            // CraftBukkit end
             if (packet.a()) {
                 packet.handle(this.o);
            } else {
                this.k.add(packet);
            }
        }
    }
--