Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 01:17:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

update paper

Browse Source
This commit is contained in:
William Blake Galbreath
2021-06-21 07:53:48 -05:00
parent df9b73cf73
commit 8ee573806f
22 changed files with 60 additions and 495 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
patches/api/0022-Configurable-permission-message-upgrades.patch
View File

@@ -6,22 +6,29 @@ Subject: [PATCH] Configurable permission message upgrades
This allows the configurable permission message in paper.yml to be blank and also support newlines
diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
index c10fc8d2386301bc2caddcdb1cd18566bcaa8689..882c565ac2be3df976e7bbeb4dc80c9ac474a8b1 100644
index 1994f15831de1ca1bb7b4f52c23567825766d3f9..514efc8c79756a4ce7bc854586f9593af1d0180c 100644
--- a/src/main/java/org/bukkit/command/Command.java
+++ b/src/main/java/org/bukkit/command/Command.java
@@ -184,9 +184,13 @@ public abstract class Command {
@@ -184,17 +184,11 @@ public abstract class Command {
return true;
}
+ // Purpur start
+ String permissionMessage = this.permissionMessage;
if (permissionMessage == null) {
- target.sendMessage(Bukkit.getPermissionMessage()); // Paper
- if (permissionMessage == null) {
- // Paper start
- String bukkitPermissionMessage = Bukkit.getPermissionMessage();
- if (org.apache.commons.lang.StringUtils.isNotBlank(bukkitPermissionMessage)) {
- target.sendMessage(bukkitPermissionMessage);
- }
- // Paper end
- } else if (permissionMessage.length() != 0) {
+ permissionMessage = Bukkit.getPermissionMessage();
+ }
+ if (permissionMessage.length() != 0) {
+ // Purpur end
for (String line : permissionMessage.replace("<permission>", permission).split("\n")) {
target.sendMessage(line);
}
- for (String line : permissionMessage.replace("<permission>", permission).split("\n")) {
- target.sendMessage(line);
- }
+ // Purpur start
+ String msg = this.permissionMessage != null ? this.permissionMessage : Bukkit.getPermissionMessage();
+ for (String line : msg.replace("<permission>", permission).split("\n")) {
+ if (org.apache.commons.lang.StringUtils.isNotBlank(line)) target.sendMessage(line);
+ //Purpur end
}
return false;