1 files changed, 100 insertions, 0 deletions
diff --git a/patches/server/0658-More-CommandBlock-API.patch b/patches/server/0658-More-CommandBlock-API.patch
new file mode 100644
index 0000000000..162a84f2e6
--- /dev/null
+++ b/patches/server/0658-More-CommandBlock-API.patch
@@ -0,0 +1,100 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Thu, 23 Sep 2021 10:40:09 -0700
+Subject: [PATCH] More CommandBlock API
+
+
+diff --git a/src/main/java/io/papermc/paper/commands/PaperCommandBlockHolder.java b/src/main/java/io/papermc/paper/commands/PaperCommandBlockHolder.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..0b42306f17bf8850a13a51067c2d19e7583187e5
+--- /dev/null
++++ b/src/main/java/io/papermc/paper/commands/PaperCommandBlockHolder.java
+@@ -0,0 +1,33 @@
++package io.papermc.paper.commands;
++
++import io.papermc.paper.adventure.PaperAdventure;
++import io.papermc.paper.command.CommandBlockHolder;
++import net.kyori.adventure.text.Component;
++import net.minecraft.world.level.BaseCommandBlock;
++import org.jetbrains.annotations.NotNull;
++import org.jetbrains.annotations.Nullable;
++
++public interface PaperCommandBlockHolder extends CommandBlockHolder {
++
++    BaseCommandBlock getCommandBlockHandle();
++
++    @Override
++    default @NotNull Component lastOutput() {
++        return PaperAdventure.asAdventure(getCommandBlockHandle().getLastOutput());
++    }
++
++    @Override
++    default void lastOutput(@Nullable Component lastOutput) {
++        getCommandBlockHandle().setLastOutput(PaperAdventure.asVanilla(lastOutput));
++    }
++
++    @Override
++    default int getSuccessCount() {
++        return getCommandBlockHandle().getSuccessCount();
++    }
++
++    @Override
++    default void setSuccessCount(int successCount) {
++        getCommandBlockHandle().setSuccessCount(successCount);
++    }
++}
+diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftCommandBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftCommandBlock.java
+index bdd0647d683565088e5cfcd43fb26f4b776db338..42c39c91d2b8e2bc32592adb8813f8a13936f34a 100644
+--- a/src/main/java/org/bukkit/craftbukkit/block/CraftCommandBlock.java
++++ b/src/main/java/org/bukkit/craftbukkit/block/CraftCommandBlock.java
+@@ -5,7 +5,7 @@ import org.bukkit.World;
+ import org.bukkit.block.CommandBlock;
+ import org.bukkit.craftbukkit.util.CraftChatMessage;
+ 
+-public class CraftCommandBlock extends CraftBlockEntityState<CommandBlockEntity> implements CommandBlock {
++public class CraftCommandBlock extends CraftBlockEntityState<CommandBlockEntity> implements CommandBlock, io.papermc.paper.commands.PaperCommandBlockHolder {
+ 
+     public CraftCommandBlock(World world, CommandBlockEntity tileEntity) {
+         super(world, tileEntity);
+@@ -50,5 +50,10 @@ public class CraftCommandBlock extends CraftBlockEntityState<CommandBlockEntity>
+     public void name(net.kyori.adventure.text.Component name) {
+         getSnapshot().getCommandBlock().setName(name == null ? net.minecraft.network.chat.Component.literal("@") : io.papermc.paper.adventure.PaperAdventure.asVanilla(name));
+     }
++
++    @Override
++    public net.minecraft.world.level.BaseCommandBlock getCommandBlockHandle() {
++        return getSnapshot().getCommandBlock();
++    }
+     // Paper end
+ }
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartCommand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartCommand.java
+index 66fb6aeb49b7e93d2a4d9b5ce7f1a7d68f571cf5..2534abcdce426189ac15e0659ab62840b3d54762 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartCommand.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartCommand.java
+@@ -13,7 +13,7 @@ import org.bukkit.permissions.PermissionAttachment;
+ import org.bukkit.permissions.PermissionAttachmentInfo;
+ import org.bukkit.plugin.Plugin;
+ 
+-public class CraftMinecartCommand extends CraftMinecart implements CommandMinecart {
++public class CraftMinecartCommand extends CraftMinecart implements CommandMinecart, io.papermc.paper.commands.PaperCommandBlockHolder {
+     private final PermissibleBase perm = new PermissibleBase(this);
+ 
+     public CraftMinecartCommand(CraftServer server, MinecartCommandBlock entity) {
+@@ -64,6 +64,17 @@ public class CraftMinecartCommand extends CraftMinecart implements CommandMineca
+     public [email protected] Component name() {
+         return io.papermc.paper.adventure.PaperAdventure.asAdventure(this.getHandle().getCommandBlock().getName());
+     }
++
++    @Override
++    public net.minecraft.world.level.BaseCommandBlock getCommandBlockHandle() {
++        return getHandle().getCommandBlock();
++    }
++
++    @Override
++    public void lastOutput(net.kyori.adventure.text.Component lastOutput) {
++        io.papermc.paper.commands.PaperCommandBlockHolder.super.lastOutput(lastOutput);
++        getCommandBlockHandle().onUpdated();
++    }
+     // Paper end
+ 
+     @Override