testserver/CraftBukkit-Patches/0139-Process-conversation-i...

35 lines
1.5 KiB
Diff
Raw Normal View History

From 38b9953601d971d2dc45f32d10a205e6eaf215f2 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 c80e06f..024ec84 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -835,7 +835,18 @@ public class PlayerConnection implements PacketPlayInListener {
} 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]);
--
1.9.1