From 932e97f345fa539c0a690ff298e61cc13e3071b8 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 2 May 2020 15:25:55 -0400 Subject: [PATCH] Rename to AsyncPlayerSendSuggestionsEvent to be consistent in naming It was still technically read correctly in what it was doing, but all our Player events begin with Player. Nothing uses this event yet so safe to rename. If you are some rapid adopter of this event, sorry :P --- ...onsEvent.java => AsyncPlayerSendSuggestionsEvent.java} | 4 ++-- .../0494-Implement-Brigadier-Mojang-API.patch | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) rename Paper-MojangAPI/src/main/java/com/destroystokyo/paper/event/brigadier/{AsyncSendPlayerSuggestionsEvent.java => AsyncPlayerSendSuggestionsEvent.java} (93%) diff --git a/Paper-MojangAPI/src/main/java/com/destroystokyo/paper/event/brigadier/AsyncSendPlayerSuggestionsEvent.java b/Paper-MojangAPI/src/main/java/com/destroystokyo/paper/event/brigadier/AsyncPlayerSendSuggestionsEvent.java similarity index 93% rename from Paper-MojangAPI/src/main/java/com/destroystokyo/paper/event/brigadier/AsyncSendPlayerSuggestionsEvent.java rename to Paper-MojangAPI/src/main/java/com/destroystokyo/paper/event/brigadier/AsyncPlayerSendSuggestionsEvent.java index dbdb72984..13819b618 100644 --- a/Paper-MojangAPI/src/main/java/com/destroystokyo/paper/event/brigadier/AsyncSendPlayerSuggestionsEvent.java +++ b/Paper-MojangAPI/src/main/java/com/destroystokyo/paper/event/brigadier/AsyncPlayerSendSuggestionsEvent.java @@ -13,7 +13,7 @@ import org.jetbrains.annotations.NotNull; * Called when sending Suggestions to the client. Will be called asynchronously if a plugin * marks the AsyncTabComplete event handled asynchronously, otherwise called synchronously. */ -public class AsyncSendPlayerSuggestionsEvent extends PlayerEvent implements Cancellable { +public class AsyncPlayerSendSuggestionsEvent extends PlayerEvent implements Cancellable { private static final HandlerList handlers = new HandlerList(); private boolean cancelled = false; @@ -21,7 +21,7 @@ public class AsyncSendPlayerSuggestionsEvent extends PlayerEvent implements Canc private Suggestions suggestions; private final String buffer; - public AsyncSendPlayerSuggestionsEvent(Player player, Suggestions suggestions, String buffer) { + public AsyncPlayerSendSuggestionsEvent(Player player, Suggestions suggestions, String buffer) { super(player, !Bukkit.isPrimaryThread()); this.suggestions = suggestions; this.buffer = buffer; diff --git a/Spigot-Server-Patches/0494-Implement-Brigadier-Mojang-API.patch b/Spigot-Server-Patches/0494-Implement-Brigadier-Mojang-API.patch index bcc7dee11..9cf0d2ea8 100644 --- a/Spigot-Server-Patches/0494-Implement-Brigadier-Mojang-API.patch +++ b/Spigot-Server-Patches/0494-Implement-Brigadier-Mojang-API.patch @@ -1,4 +1,4 @@ -From 93ca45257861ecd220c28c8e9b14638d6e3206dc Mon Sep 17 00:00:00 2001 +From 2b3eacadbea7c13465bc855a2dacd7bbeeaaa33b Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 19 Apr 2020 18:15:29 -0400 Subject: [PATCH] Implement Brigadier Mojang API @@ -69,7 +69,7 @@ index 0b23a0548d..c988c929f1 100644 public boolean hasPermission(int i) { // CraftBukkit start diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 38ec22f4c0..376f7f8f0b 100644 +index 38ec22f4c0..a180df220e 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -576,8 +576,12 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -79,7 +79,7 @@ index 38ec22f4c0..376f7f8f0b 100644 - if (((Suggestions) suggestions).isEmpty()) return; // CraftBukkit - don't send through empty suggestions - prevents [] from showing for plugins with nothing more to offer - this.networkManager.sendPacket(new PacketPlayOutTabComplete(packetplayintabcomplete.b(), (Suggestions) suggestions)); // CraftBukkit - decompile error + // Paper start -+ com.destroystokyo.paper.event.brigadier.AsyncSendPlayerSuggestionsEvent suggestEvent = new com.destroystokyo.paper.event.brigadier.AsyncSendPlayerSuggestionsEvent(this.getPlayer(), suggestions, buffer); ++ com.destroystokyo.paper.event.brigadier.AsyncPlayerSendSuggestionsEvent suggestEvent = new com.destroystokyo.paper.event.brigadier.AsyncPlayerSendSuggestionsEvent(this.getPlayer(), suggestions, buffer); + suggestEvent.setCancelled(suggestions.isEmpty()); + if (!suggestEvent.callEvent()) return; + this.networkManager.sendPacket(new PacketPlayOutTabComplete(packetplayintabcomplete.b(), (Suggestions) suggestEvent.getSuggestions())); // CraftBukkit - decompile error // Paper @@ -93,7 +93,7 @@ index 38ec22f4c0..376f7f8f0b 100644 completions.forEach(builder::suggest); - player.playerConnection.sendPacket(new PacketPlayOutTabComplete(packetplayintabcomplete.b(), builder.buildFuture().join())); + Suggestions suggestions = builder.buildFuture().join(); -+ com.destroystokyo.paper.event.brigadier.AsyncSendPlayerSuggestionsEvent suggestEvent = new com.destroystokyo.paper.event.brigadier.AsyncSendPlayerSuggestionsEvent(this.getPlayer(), suggestions, buffer); ++ com.destroystokyo.paper.event.brigadier.AsyncPlayerSendSuggestionsEvent suggestEvent = new com.destroystokyo.paper.event.brigadier.AsyncPlayerSendSuggestionsEvent(this.getPlayer(), suggestions, buffer); + suggestEvent.setCancelled(suggestions.isEmpty()); + if (!suggestEvent.callEvent()) return; + this.networkManager.sendPacket(new PacketPlayOutTabComplete(packetplayintabcomplete.b(), suggestEvent.getSuggestions()));