Several fixes and new api for experience merging/stacking (#9242)

1 files changed, 46 insertions, 0 deletions

diff --git a/patches/server/0776-Add-Moving-Piston-API.patch b/patches/server/0776-Add-Moving-Piston-API.patch
new file mode 100644
index 0000000000..e3d3955822
--- /dev/null
+++ b/patches/server/0776-Add-Moving-Piston-API.patch
@@ -0,0 +1,46 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Owen1212055 <[email protected]>
+Date: Sat, 4 Dec 2021 13:29:36 -0500
+Subject: [PATCH] Add Moving Piston API
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftMovingPiston.java b/src/main/java/org/bukkit/craftbukkit/block/CraftMovingPiston.java
+index 25b759dee5ae2b311965f26ba311591199894be4..293ac0b658224fc0b3c2acdfc86eff3c8a9fdc04 100644
+--- a/src/main/java/org/bukkit/craftbukkit/block/CraftMovingPiston.java
++++ b/src/main/java/org/bukkit/craftbukkit/block/CraftMovingPiston.java
+@@ -4,7 +4,7 @@ import net.minecraft.world.level.block.piston.PistonMovingBlockEntity;
+ import org.bukkit.Location;
+ import org.bukkit.World;
+ 
+-public class CraftMovingPiston extends CraftBlockEntityState<PistonMovingBlockEntity> {
++public class CraftMovingPiston extends CraftBlockEntityState<PistonMovingBlockEntity> implements io.papermc.paper.block.MovingPiston { // Paper - Add Moving Piston API
+ 
+     public CraftMovingPiston(World world, PistonMovingBlockEntity tileEntity) {
+         super(world, tileEntity);
+@@ -23,4 +23,26 @@ public class CraftMovingPiston extends CraftBlockEntityState<PistonMovingBlockEn
+     public CraftMovingPiston copy(Location location) {
+         return new CraftMovingPiston(this, location);
+     }
++
++    // Paper start - Add Moving Piston API
++    @Override
++    public org.bukkit.block.data.BlockData getMovingBlock() {
++        return org.bukkit.craftbukkit.block.data.CraftBlockData.fromData(this.getTileEntity().getMovedState());
++    }
++
++    @Override
++    public org.bukkit.block.BlockFace getDirection() {
++        return org.bukkit.craftbukkit.block.CraftBlock.notchToBlockFace(this.getTileEntity().getDirection());
++    }
++
++    @Override
++    public boolean isExtending() {
++        return this.getTileEntity().isExtending();
++    }
++
++    @Override
++    public boolean isPistonHead() {
++        return this.getTileEntity().isSourcePiston();
++    }
++    // Paper end - Add Moving Piston API
+ }