mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
adf463a0af
Upstream has released updates that appears to apply and compile correctly Paper Changes: 8522e7b2 Fix shutdown on eula not being agreed (Fixes #4647) c43dcbfc Improve old UUID support, clean up old legacy keys. f63e3dd1 Allow teleporting through end gateways as a passenger/vehicle b7d9e3d5 Convert legacy attributes in Item Meta 4fd0d54e Fix server not stopping when eula not agreed yet 6f30ecde Clean up duplicated GameProfile Properties d3047226 Fix supporting more places of the old UUID format f5265d66 Updated Upstream (Bukkit/CraftBukkit/Spigot)
38 lines
2.0 KiB
Diff
38 lines
2.0 KiB
Diff
From 0efc3418e55cf91ac4cfedd251486777e746768d Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
|
Date: Sat, 28 Mar 2020 01:51:32 -0500
|
|
Subject: [PATCH] Fix vanilla command permission handler
|
|
|
|
---
|
|
src/main/java/com/mojang/brigadier/tree/CommandNode.java | 1 +
|
|
.../org/bukkit/craftbukkit/command/VanillaCommandWrapper.java | 1 +
|
|
2 files changed, 2 insertions(+)
|
|
|
|
diff --git a/src/main/java/com/mojang/brigadier/tree/CommandNode.java b/src/main/java/com/mojang/brigadier/tree/CommandNode.java
|
|
index 5e3fc338b..b3835c3c7 100644
|
|
--- a/src/main/java/com/mojang/brigadier/tree/CommandNode.java
|
|
+++ b/src/main/java/com/mojang/brigadier/tree/CommandNode.java
|
|
@@ -35,6 +35,7 @@ public abstract class CommandNode<S> implements Comparable<CommandNode<S>> {
|
|
private final RedirectModifier<S> modifier;
|
|
private final boolean forks;
|
|
private Command<S> command;
|
|
+ private String permission = null; public String getPermission() { return permission; } public void setPermission(String permission) { this.permission = permission; } // Purpur
|
|
// CraftBukkit start
|
|
public void removeCommand(String name) {
|
|
children.remove(name);
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
|
|
index f34461460..8d89e671e 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
|
|
@@ -87,6 +87,7 @@ public final class VanillaCommandWrapper extends BukkitCommand {
|
|
}
|
|
|
|
public static String getPermission(CommandNode<CommandListenerWrapper> vanillaCommand) {
|
|
+ if (vanillaCommand.getPermission() != null) return vanillaCommand.getPermission(); // Purpur
|
|
return "minecraft.command." + ((vanillaCommand.getRedirect() == null) ? vanillaCommand.getName() : vanillaCommand.getRedirect().getName());
|
|
}
|
|
|
|
--
|
|
2.26.2
|
|
|