mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-26 09:06:40 +01:00
34 lines
1.5 KiB
Diff
34 lines
1.5 KiB
Diff
From 3e89e455b100207f1f954e13ab8f89d7c2e98dcb 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 7eb563b..43367dd 100644
|
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
@@ -956,7 +956,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() == EntityHuman.EnumChatVisibility.SYSTEM) { // Re-add "Command Only" flag check
|
|
ChatMessage chatmessage = new ChatMessage("chat.cannotSend", new Object[0]);
|
|
|
|
--
|
|
2.1.4
|
|
|