mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-06 03:48:05 +02:00
28 lines
1.4 KiB
Diff
28 lines
1.4 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
||
|
Date: Tue, 27 Jun 2023 16:32:39 -0700
|
||
|
Subject: [PATCH] Improve command function perm level checks
|
||
|
|
||
|
|
||
|
diff --git a/src/main/java/net/minecraft/commands/CommandSourceStack.java b/src/main/java/net/minecraft/commands/CommandSourceStack.java
|
||
|
index 43c71d9bf2eac98023057b4483fdd143a8343e98..0de2eae2d448ac9e269a4edf48406d5ea8af8059 100644
|
||
|
--- a/src/main/java/net/minecraft/commands/CommandSourceStack.java
|
||
|
+++ b/src/main/java/net/minecraft/commands/CommandSourceStack.java
|
||
|
@@ -216,8 +216,14 @@ public class CommandSourceStack implements SharedSuggestionProvider, com.destroy
|
||
|
|
||
|
// CraftBukkit start
|
||
|
public boolean hasPermission(int i, String bukkitPermission) {
|
||
|
- // World is null when loading functions
|
||
|
- return ((this.getLevel() == null || !this.getLevel().getCraftServer().ignoreVanillaPermissions) && this.permissionLevel >= i) || this.getBukkitSender().hasPermission(bukkitPermission);
|
||
|
+ // Paper start
|
||
|
+ boolean hasPermissionLevel = this.permissionLevel >= i;
|
||
|
+ if (this.source == CommandSource.NULL) {
|
||
|
+ return hasPermissionLevel;
|
||
|
+ } else {
|
||
|
+ return (!this.getLevel().getCraftServer().ignoreVanillaPermissions && hasPermissionLevel) || this.getBukkitSender().hasPermission(bukkitPermission);
|
||
|
+ }
|
||
|
+ // Paper end
|
||
|
}
|
||
|
// CraftBukkit end
|
||
|
|