net/minecraft/world/level

2024-12-14 23:42:27 +00:00
parent 5deb3e9671
commit 767215bf9b
23 changed files with 1110 additions and 1224 deletions
--- a/paper-server/patches/sources/net/minecraft/world/level/BaseCommandBlock.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/level/BaseCommandBlock.java.patch
@ -0,0 +1,40 @@
+--- a/net/minecraft/world/level/BaseCommandBlock.java
+++ b/net/minecraft/world/level/BaseCommandBlock.java
+@@ -32,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;
+@@ -126,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");
+@@ -162,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();
+         }
+@@ -184,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.getCommandSenderWorld().isClientSide) {