mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-29 15:49:00 +01:00
a25f99d254
Upstream has released updates that appears 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: 122289ff Add FaceAttachable interface to handle Grindstone facing in common with Switches a6db750e SPIGOT-5647: ZombieVillager entity should have getVillagerType() CraftBukkit Changes:bbe3d58eSPIGOT-5650: Lectern.setPage(int) causes a NullPointerException3075579fAdd FaceAttachable interface to handle Grindstone facing in common with Switches95bd4238SPIGOT-5647: ZombieVillager entity should have getVillagerType()4d975ac3SPIGOT-5617: setBlockData does not work when NotPlayEvent is called by redstone current
48 lines
No EOL
2.6 KiB
Diff
48 lines
No EOL
2.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
|
|
Date: Thu, 31 Jan 2019 16:33:36 -0500
|
|
Subject: [PATCH] Fire BlockPistonRetractEvent for all empty pistons
|
|
|
|
There is an explicit check in the handling code for empty pistons that
|
|
prevents sticky pistons from firing the event. However when we look back
|
|
at the history we see that this check was originally added so that ONLY
|
|
sticky pistons would fire the retract event. I'm not sure why.
|
|
https://hub.spigotmc.org/stash/projects/SPIGOT/repos/craftbukkit/commits/1092acbddf07edfa4100bc6824504ac75088e913
|
|
|
|
Over the course of several updates, the meaning of that field appears to
|
|
have changed from "is NOT sticky" to "is sticky". So now its having the
|
|
opposite effect. Only normal pistons fire the retraction event. And like
|
|
all things in CB, it's just been carried around since.
|
|
|
|
If we are to believe the history, the correct fix for this issue is to
|
|
flip it so it only fires for sticky pistons, but that puts us in a
|
|
bind. It's already firing for non-sticky pistons, changing it now would
|
|
likely result in breakage. Furthermore, there is little documentation as
|
|
to WHY that was ever intended to be the case.
|
|
|
|
Instead we opt to remove the check entirely so that the event fires for
|
|
all piston types.
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/BlockPiston.java b/src/main/java/net/minecraft/server/BlockPiston.java
|
|
index 1170a28107..b29525c40d 100644
|
|
--- a/src/main/java/net/minecraft/server/BlockPiston.java
|
|
+++ b/src/main/java/net/minecraft/server/BlockPiston.java
|
|
@@ -0,0 +0,0 @@ public class BlockPiston extends BlockDirectional {
|
|
}
|
|
|
|
// CraftBukkit start
|
|
- if (!this.sticky) {
|
|
+ //if (!this.sticky) { // Paper - Prevents empty sticky pistons from firing retract - history behind is odd
|
|
org.bukkit.block.Block block = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
|
|
BlockPistonRetractEvent event = new BlockPistonRetractEvent(block, ImmutableList.<org.bukkit.block.Block>of(), CraftBlock.notchToBlockFace(enumdirection));
|
|
world.getServer().getPluginManager().callEvent(event);
|
|
@@ -0,0 +0,0 @@ public class BlockPiston extends BlockDirectional {
|
|
if (event.isCancelled()) {
|
|
return;
|
|
}
|
|
- }
|
|
+ //} // Paper
|
|
// PAIL: checkME - what happened to setTypeAndData?
|
|
// CraftBukkit end
|
|
world.playBlockAction(blockposition, this, b0, enumdirection.b());
|
|
--
|