Paper/CraftBukkit-Patches/0121-Process-conversation-input-on-the-main-thread.-Fixes.patch
2015-01-06 22:09:08 -06:00

35 lines
1.5 KiB
Diff

From c48889161ff7e3a658b05a7a895f70d1e369f41e Mon Sep 17 00:00:00 2001
From: riking <rikingcoding@gmail.com>
Date: Wed, 14 May 2014 13:46:48 -0700
Subject: [PATCH] Process conversation input on the main thread. Fixes
BUKKIT-5611
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 810a96e..36e1f2c 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -936,7 +936,18 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
} else if (s.isEmpty()) {
c.warn(this.player.getName() + " tried to send an empty message");
} else if (getPlayer().isConversing()) {
- getPlayer().acceptConversationInput(s);
+ // Spigot start
+ final String message = s;
+ this.minecraftServer.processQueue.add( new Waitable()
+ {
+ @Override
+ protected Object evaluate()
+ {
+ getPlayer().acceptConversationInput( message );
+ return null;
+ }
+ } );
+ // Spigot end
} else if (this.player.getChatFlags() == EnumChatVisibility.SYSTEM) { // Re-add "Command Only" flag check
ChatMessage chatmessage = new ChatMessage("chat.cannotSend", new Object[0]);
--
2.1.0