2020-05-06 11:48:49 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2017-06-18 02:53:31 +02: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
|
2020-06-25 15:11:48 +02:00
|
|
|
index 08bc47fdec472c73493cc1a75bd0d84287b1c811..1d7549e03bc43f1867662acf12ae3cb82a951478 100644
|
2017-06-18 02:53:31 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
2020-06-25 15:11:48 +02:00
|
|
|
@@ -104,6 +104,7 @@ import net.minecraft.server.WorldNBTStorage;
|
|
|
|
import net.minecraft.server.WorldServer;
|
2019-05-06 05:53:47 +02: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 15:11:48 +02:00
|
|
|
@@ -175,6 +176,7 @@ import org.bukkit.craftbukkit.util.Versioning;
|
2017-06-18 02:53:31 +02:00
|
|
|
import org.bukkit.craftbukkit.util.permissions.CraftDefaultPermissions;
|
|
|
|
import org.bukkit.entity.Entity;
|
|
|
|
import org.bukkit.entity.Player;
|
2017-07-28 15:45:16 +02:00
|
|
|
+import org.bukkit.event.command.UnknownCommandEvent; // Paper
|
2017-06-18 02:53:31 +02:00
|
|
|
import org.bukkit.event.inventory.InventoryType;
|
|
|
|
import org.bukkit.event.player.PlayerChatTabCompleteEvent;
|
2017-07-28 15:45:16 +02:00
|
|
|
import org.bukkit.event.server.BroadcastMessageEvent;
|
2020-06-25 15:11:48 +02:00
|
|
|
@@ -775,7 +777,13 @@ public final class CraftServer implements Server {
|
2017-06-18 02:53:31 +02:00
|
|
|
|
|
|
|
// Spigot start
|
2018-07-18 02:08:13 +02:00
|
|
|
if (!org.spigotmc.SpigotConfig.unknownCommandMessage.isEmpty()) {
|
2017-06-18 02:53:31 +02: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
|
|
|
|
|