a24f9b204c
Co-authored-by: Bjarne Koll <git@lynxplay.dev> Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com> Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Co-authored-by: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com> Co-authored-by: Noah van der Aa <ndvdaa@gmail.com> Co-authored-by: Owen1212055 <23108066+Owen1212055@users.noreply.github.com> Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com>
41 lines
1.8 KiB
Diff
41 lines
1.8 KiB
Diff
--- a/net/minecraft/world/level/BaseCommandBlock.java
|
|
+++ b/net/minecraft/world/level/BaseCommandBlock.java
|
|
@@ -34,6 +_,11 @@
|
|
private String command = "";
|
|
@Nullable
|
|
private Component customName;
|
|
+ // CraftBukkit start
|
|
+ @Override
|
|
+ public abstract org.bukkit.command.CommandSender getBukkitSender(CommandSourceStack wrapper);
|
|
+ // CraftBukkit end
|
|
+
|
|
|
|
public int getSuccessCount() {
|
|
return this.successCount;
|
|
@@ -108,7 +_,7 @@
|
|
this.successCount++;
|
|
}
|
|
});
|
|
- server.getCommands().performPrefixedCommand(commandSourceStack, this.command);
|
|
+ server.getCommands().dispatchServerCommand(commandSourceStack, this.command); // CraftBukkit
|
|
} catch (Throwable var6) {
|
|
CrashReport crashReport = CrashReport.forThrowable(var6, "Executing command block");
|
|
CrashReportCategory crashReportCategory = crashReport.addCategory("Command to be executed");
|
|
@@ -144,6 +_,7 @@
|
|
@Override
|
|
public void sendSystemMessage(Component component) {
|
|
if (this.trackOutput) {
|
|
+ org.spigotmc.AsyncCatcher.catchOp("sendSystemMessage to a command block"); // Paper - Don't broadcast messages to command blocks
|
|
this.lastOutput = Component.literal("[" + TIME_FORMAT.format(new Date()) + "] ").append(component);
|
|
this.onUpdated();
|
|
}
|
|
@@ -166,7 +_,7 @@
|
|
}
|
|
|
|
public InteractionResult usedBy(Player player) {
|
|
- if (!player.canUseGameMasterBlocks()) {
|
|
+ if (!player.canUseGameMasterBlocks() && (!player.isCreative() || !player.getBukkitEntity().hasPermission("minecraft.commandblock"))) { // Paper - command block permission
|
|
return InteractionResult.PASS;
|
|
} else {
|
|
if (player.level().isClientSide) {
|