Skip to content
This repository was archived by the owner on Dec 29, 2023. It is now read-only.

Commit 0d24aac

Browse files
committed
Don't send empty permission and unknown command message
1 parent 01fc3b2 commit 0d24aac

2 files changed

+50
-0
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
From 7e0fa7bedd6bc1ee76a263e78d9b19e34fe50c03 Mon Sep 17 00:00:00 2001
2+
From: Peridot <[email protected]>
3+
Date: Thu, 8 Sep 2022 01:17:38 +0200
4+
Subject: [PATCH] Don't send empty permission and unknown command message
5+
6+
7+
diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
8+
index 523b4679..b8bd959f 100644
9+
--- a/src/main/java/org/bukkit/command/Command.java
10+
+++ b/src/main/java/org/bukkit/command/Command.java
11+
@@ -204,6 +204,10 @@ public abstract class Command {
12+
permissionMessage = Bukkit.titanium().getMessages().getMissingPermissionCommand();
13+
}
14+
15+
+ if (permissionMessage == null || permissionMessage.isEmpty()) {
16+
+ return false;
17+
+ }
18+
+
19+
permissionMessage = permissionMessage.replace("<permission>", "{PERMISSION}");
20+
permissionMessage = permissionMessage.replace("{PERMISSION}", permission);
21+
22+
--
23+
2.36.0.windows.1
24+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
From 5535f8e0492d82d59c50b835e05bedf9bdbeb38c Mon Sep 17 00:00:00 2001
2+
From: Peridot <[email protected]>
3+
Date: Thu, 8 Sep 2022 01:17:37 +0200
4+
Subject: [PATCH] Don't send empty permission and unknown command message
5+
6+
7+
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
8+
index 35c80129c..1f399a97a 100644
9+
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
10+
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
11+
@@ -813,7 +813,11 @@ public final class CraftServer implements Server {
12+
UnknownCommandEvent event = new UnknownCommandEvent(sender, commandLine);
13+
this.pluginManager.callEvent(event);
14+
if (!event.isCancelled()) {
15+
- sender.sendMessage(java.text.MessageFormat.format(MessageConfig.get().unknownCommand, event.getCommand())); // Titanium - placeholder of what command was tried to use
16+
+ String message = MessageConfig.get().unknownCommand;
17+
+ if (message == null || message.isEmpty()) {
18+
+ return false;
19+
+ }
20+
+ sender.sendMessage(java.text.MessageFormat.format(message, event.getCommand())); // Titanium - placeholder of what command was tried to use
21+
}
22+
// Titanium end
23+
return false;
24+
--
25+
2.36.0.windows.1
26+

0 commit comments

Comments
 (0)