mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-05 10:20:53 +01:00
62 lines
2.6 KiB
Diff
62 lines
2.6 KiB
Diff
--- a/net/minecraft/server/CommandListenerWrapper.java
|
|
+++ b/net/minecraft/server/CommandListenerWrapper.java
|
|
@@ -7,6 +7,7 @@
|
|
import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
|
|
import com.mojang.brigadier.suggestion.Suggestions;
|
|
import com.mojang.brigadier.suggestion.SuggestionsBuilder;
|
|
+import com.mojang.brigadier.tree.CommandNode;
|
|
import java.util.Collection;
|
|
import java.util.Iterator;
|
|
import java.util.concurrent.CompletableFuture;
|
|
@@ -31,6 +32,7 @@
|
|
private final ResultConsumer<CommandListenerWrapper> l;
|
|
private final ArgumentAnchor.Anchor m;
|
|
private final Vec2F n;
|
|
+ public CommandNode currentCommand; // CraftBukkit
|
|
|
|
public CommandListenerWrapper(ICommandListener icommandlistener, Vec3D vec3d, Vec2F vec2f, WorldServer worldserver, int i, String s, IChatBaseComponent ichatbasecomponent, MinecraftServer minecraftserver, @Nullable Entity entity) {
|
|
this(icommandlistener, vec3d, vec2f, worldserver, i, s, ichatbasecomponent, minecraftserver, entity, false, (commandcontext, flag, j) -> {
|
|
@@ -120,9 +122,22 @@
|
|
|
|
@Override
|
|
public boolean hasPermission(int i) {
|
|
+ // CraftBukkit start
|
|
+ if (currentCommand != null) {
|
|
+ return hasPermission(i, org.bukkit.craftbukkit.command.VanillaCommandWrapper.getPermission(currentCommand));
|
|
+ }
|
|
+ // CraftBukkit end
|
|
+
|
|
return this.f >= i;
|
|
}
|
|
|
|
+ // CraftBukkit start
|
|
+ public boolean hasPermission(int i, String bukkitPermission) {
|
|
+ // World is null when loading functions
|
|
+ return ((getWorld() == null || !getWorld().getServer().ignoreVanillaPermissions) && this.f >= i) || getBukkitSender().hasPermission(bukkitPermission);
|
|
+ }
|
|
+ // CraftBukkit end
|
|
+
|
|
public Vec3D getPosition() {
|
|
return this.d;
|
|
}
|
|
@@ -184,7 +199,7 @@
|
|
while (iterator.hasNext()) {
|
|
EntityPlayer entityplayer = (EntityPlayer) iterator.next();
|
|
|
|
- if (entityplayer != this.base && this.i.getPlayerList().isOp(entityplayer.getProfile())) {
|
|
+ if (entityplayer != this.base && entityplayer.getBukkitEntity().hasPermission("minecraft.admin.command_feedback")) { // CraftBukkit
|
|
entityplayer.sendMessage(ichatbasecomponent1);
|
|
}
|
|
}
|
|
@@ -234,4 +249,10 @@
|
|
public CompletableFuture<Suggestions> a(CommandContext<ICompletionProvider> commandcontext, SuggestionsBuilder suggestionsbuilder) {
|
|
return null;
|
|
}
|
|
+
|
|
+ // CraftBukkit start
|
|
+ public org.bukkit.command.CommandSender getBukkitSender() {
|
|
+ return base.getBukkitSender(this);
|
|
+ }
|
|
+ // CraftBukkit end
|
|
}
|