testserver/Spigot-Server-Patches/0152-Add-UnknownCommandEven...

42 lines
1.9 KiB
Diff
Raw Normal View History

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2017-06-18 00:53:31 +00:00
From: Sweepyoface <github@sweepy.pw>
Date: Sat, 17 Jun 2017 18:48:21 -0400
Subject: [PATCH] Add UnknownCommandEvent
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index db41896b45f1608fbeb962d3ffe25d9608b36cc4..60a44992a962e15686f89247823389d3757d8b8c 100644
2017-06-18 00:53:31 +00:00
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
2020-06-25 14:09:55 +00:00
@@ -105,6 +105,7 @@ import net.minecraft.server.WorldNBTStorage;
2020-06-25 13:11:48 +00:00
import net.minecraft.server.WorldServer;
2019-05-06 03:53:47 +00:00
import net.minecraft.server.WorldSettings;
import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.StringUtils;
import org.bukkit.BanList;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
2020-06-25 14:09:55 +00:00
@@ -176,6 +177,7 @@ import org.bukkit.craftbukkit.util.Versioning;
2017-06-18 00:53:31 +00:00
import org.bukkit.craftbukkit.util.permissions.CraftDefaultPermissions;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
2017-07-28 13:45:16 +00:00
+import org.bukkit.event.command.UnknownCommandEvent; // Paper
2017-06-18 00:53:31 +00:00
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.event.player.PlayerChatTabCompleteEvent;
2017-07-28 13:45:16 +00:00
import org.bukkit.event.server.BroadcastMessageEvent;
2020-06-26 16:20:03 +00:00
@@ -783,7 +785,13 @@ public final class CraftServer implements Server {
2017-06-18 00:53:31 +00:00
// Spigot start
if (!org.spigotmc.SpigotConfig.unknownCommandMessage.isEmpty()) {
2017-06-18 00:53:31 +00:00
- sender.sendMessage(org.spigotmc.SpigotConfig.unknownCommandMessage);
+ // Paper start
+ UnknownCommandEvent event = new UnknownCommandEvent(sender, commandLine, org.spigotmc.SpigotConfig.unknownCommandMessage);
+ Bukkit.getServer().getPluginManager().callEvent(event);
+ if (StringUtils.isNotEmpty(event.getMessage())) {
+ sender.sendMessage(event.getMessage());
+ }
+ // Paper end
}
// Spigot end