From 8d9e0760aa63559ab5877412eac34f87ab5a0a5d Mon Sep 17 00:00:00 2001 From: LemonCaramel <lemoncaramel_@naver.com> Date: Tue, 18 May 2021 13:54:25 +0900 Subject: [PATCH] Fix Adventure support in UnknownCommandEvent (#5664) --- .../Add-UnknownCommandEvent.patch | 22 +++---------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/Spigot-Server-Patches/Add-UnknownCommandEvent.patch b/Spigot-Server-Patches/Add-UnknownCommandEvent.patch index 03a49a1e05..c9f550790a 100644 --- a/Spigot-Server-Patches/Add-UnknownCommandEvent.patch +++ b/Spigot-Server-Patches/Add-UnknownCommandEvent.patch @@ -8,32 +8,16 @@ diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/ja index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -0,0 +0,0 @@ import net.minecraft.world.level.storage.WorldNBTStorage; - import net.minecraft.world.level.storage.loot.LootTableRegistry; - import net.minecraft.world.phys.Vec3D; - import org.apache.commons.lang.Validate; -+import org.apache.commons.lang3.StringUtils; - import org.bukkit.BanList; - import org.bukkit.Bukkit; - import org.bukkit.ChatColor; -@@ -0,0 +0,0 @@ import org.bukkit.craftbukkit.util.Versioning; - import org.bukkit.craftbukkit.util.permissions.CraftDefaultPermissions; - import org.bukkit.entity.Entity; - import org.bukkit.entity.Player; -+import org.bukkit.event.command.UnknownCommandEvent; // Paper - import org.bukkit.event.inventory.InventoryType; - import org.bukkit.event.player.PlayerChatTabCompleteEvent; - import org.bukkit.event.server.BroadcastMessageEvent; @@ -0,0 +0,0 @@ public final class CraftServer implements Server { // Spigot start if (!org.spigotmc.SpigotConfig.unknownCommandMessage.isEmpty()) { - sender.sendMessage(org.spigotmc.SpigotConfig.unknownCommandMessage); + // Paper start -+ UnknownCommandEvent event = new UnknownCommandEvent(sender, commandLine, org.spigotmc.SpigotConfig.unknownCommandMessage); ++ org.bukkit.event.command.UnknownCommandEvent event = new org.bukkit.event.command.UnknownCommandEvent(sender, commandLine, org.spigotmc.SpigotConfig.unknownCommandMessage); + Bukkit.getServer().getPluginManager().callEvent(event); -+ if (StringUtils.isNotEmpty(event.getMessage())) { -+ sender.sendMessage(event.getMessage()); ++ if (event.message() != null) { ++ sender.sendMessage(event.message()); + } + // Paper end }