Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-16 21:31:25 +01:00
Code Issues Projects Releases Wiki Activity

Update from upstream SpigotMC

Browse Source 
No need to wait for the conversation to finish SpigotMC/Spigot@67b502b6f8
This commit is contained in:
Zach Brown 2014-07-23 10:56:36 -05:00
parent 5d8bbb9c08
commit 33c524c29b
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
CraftBukkit-Patches/0141-Process-conversation-input-on-the-main-thread.-Fixes.patch
View File

@ -14,25 +14,18 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
c.warn(this.player.getName() + " tried to send an empty message");
} else if (getPlayer().isConversing()) {
- getPlayer().acceptConversationInput(s);
+ // Spigot start
+ final String message = s;
+
+ Waitable waitable = new Waitable() {
+ this.minecraftServer.processQueue.add( new Waitable()
+ {
+ @Override
+ protected Object evaluate() {
+ getPlayer().acceptConversationInput(message);
+ protected Object evaluate()
+ {
+ getPlayer().acceptConversationInput( message );
+ return null;
+ }
+ };
+
+ this.minecraftServer.processQueue.add(waitable);
+
+ try {
+ waitable.get();
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ } catch (ExecutionException e) {
+ throw new RuntimeException(e);
+ }
+ } );
+ // Spigot end
} else if (this.player.getChatFlags() == EnumChatVisibility.SYSTEM) { // Re-add "Command Only" flag check
ChatMessage chatmessage = new ChatMessage("chat.cannotSend", new Object[0]);