mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-15 08:28:01 +02:00
de04cbced5
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: f29cb801 Separate checkstyle-suppressions file is not required 86f99bbe SPIGOT-7540, PR-946: Add ServerTickManager API d4119585 SPIGOT-6903, PR-945: Add BlockData#getMapColor b7a2ed41 SPIGOT-7530, PR-947: Add Player#removeResourcePack 9dd56255 SPIGOT-7527, PR-944: Add WindCharge#explode() 994a6163 Attempt upgrade of resolver libraries CraftBukkit Changes: b3b43a6ad Add Checkstyle check for unused imports 13fb3358e SPIGOT-7544: Scoreboard#getEntries() doesn't get entries but class names 3dda99c06 SPIGOT-7540, PR-1312: Add ServerTickManager API 2ab4508c0 SPIGOT-6903, PR-1311: Add BlockData#getMapColor 1dbdbbed4 PR-1238: Remove unnecessary sign ticking 659728d2a MC-264285, SPIGOT-7439, PR-1237: Fix unbreakable flint and steel is completely consumed while igniting creeper e37e29ce0 Increase outdated build delay c00438b39 SPIGOT-7530, PR-1313: Add Player#removeResourcePack 492dd80ce SPIGOT-7527, PR-1310: Add WindCharge#explode() e11fbb9d7 Upgrade MySQL driver 9f3a0bd2a Attempt upgrade of resolver libraries 60d16d7ca PR-1306: Centralize Bukkit and Minecraft entity conversion Spigot Changes: 06d602e7 Rebuild patches
47 lines
2.0 KiB
Diff
47 lines
2.0 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 c685846a539756ca7f0857e27f2b60d25cc13959..93ad5fed9a4d92169af0546c7e1cd8a62d19d1d7 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftMovingPiston.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftMovingPiston.java
|
|
@@ -3,7 +3,7 @@ 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);
|
|
@@ -17,4 +17,26 @@ public class CraftMovingPiston extends CraftBlockEntityState<PistonMovingBlockEn
|
|
public CraftMovingPiston copy() {
|
|
return new CraftMovingPiston(this);
|
|
}
|
|
+
|
|
+ // 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
|
|
}
|