mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-23 11:06:29 +01:00
275173e538
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 0c5d8709 SPIGOT-7400: Downgrade maven-resolver due to issues resolving certain depends 255c4fdb SPIGOT-7380: Add PlayerInteractEvent#getClickedPosition and ChiseledBookshelf#getSlot CraftBukkit Changes: b6b514b7e SPIGOT-7400: Downgrade maven-resolver due to issues resolving certain depends fcff84de9 SPIGOT-7399: Revert null check in CraftMetaItem#safelyAdd 44a4b5649 SPIGOT-7380: Add PlayerInteractEvent#getClickedPosition and ChiseledBookshelf#getSlot 676969d01 SPIGOT-7389: Handle setting null items in ChiseledBookshelf Inventory
43 lines
1.8 KiB
Diff
43 lines
1.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
|
|
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 04857cc934daee87e8bff1a8bbd8ade349c3952b..b779b4abbf3c257c2aa90697b2ed43172290bf73 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftMovingPiston.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftMovingPiston.java
|
|
@@ -3,9 +3,30 @@ package org.bukkit.craftbukkit.block;
|
|
import net.minecraft.world.level.block.piston.PistonMovingBlockEntity;
|
|
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);
|
|
}
|
|
+ // 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
|
|
}
|