2016-03-03 07:04:36 +01:00
|
|
|
From 325e20b825e6ac268d9bc3ab6ea42509dd2fe2b0 Mon Sep 17 00:00:00 2001
|
2014-07-21 22:46:54 +02:00
|
|
|
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
|
2016-03-03 07:04:36 +01:00
|
|
|
index c5f8aba..abd736c 100644
|
2014-07-21 22:46:54 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
2016-03-03 07:04:36 +01:00
|
|
|
@@ -1138,7 +1138,18 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
|
2014-07-21 22:46:54 +02:00
|
|
|
} else if (s.isEmpty()) {
|
2016-02-29 22:33:06 +01:00
|
|
|
LOGGER.warn(this.player.getName() + " tried to send an empty message");
|
2014-07-21 22:46:54 +02:00
|
|
|
} else if (getPlayer().isConversing()) {
|
|
|
|
- getPlayer().acceptConversationInput(s);
|
2014-07-23 17:56:36 +02:00
|
|
|
+ // Spigot start
|
2014-07-21 22:46:54 +02:00
|
|
|
+ final String message = s;
|
2014-07-23 17:56:36 +02:00
|
|
|
+ this.minecraftServer.processQueue.add( new Waitable()
|
|
|
|
+ {
|
2014-07-21 22:46:54 +02:00
|
|
|
+ @Override
|
2014-07-23 17:56:36 +02:00
|
|
|
+ protected Object evaluate()
|
|
|
|
+ {
|
|
|
|
+ getPlayer().acceptConversationInput( message );
|
2014-07-21 22:46:54 +02:00
|
|
|
+ return null;
|
|
|
|
+ }
|
2014-07-23 17:56:36 +02:00
|
|
|
+ } );
|
|
|
|
+ // Spigot end
|
2015-02-28 12:36:22 +01:00
|
|
|
} else if (this.player.getChatFlags() == EntityHuman.EnumChatVisibility.SYSTEM) { // Re-add "Command Only" flag check
|
2014-07-21 22:46:54 +02:00
|
|
|
ChatMessage chatmessage = new ChatMessage("chat.cannotSend", new Object[0]);
|
|
|
|
|
|
|
|
--
|
2016-02-29 22:33:06 +01:00
|
|
|
2.5.0
|
2014-07-21 22:46:54 +02:00
|
|
|
|