mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-03 21:44:40 +01:00
38 lines
2 KiB
Diff
38 lines
2 KiB
Diff
--- a/net/minecraft/server/BlockDoor.java
|
|
+++ b/net/minecraft/server/BlockDoor.java
|
|
@@ -2,6 +2,8 @@
|
|
|
|
import javax.annotation.Nullable;
|
|
|
|
+import org.bukkit.event.block.BlockRedstoneEvent; // CraftBukkit
|
|
+
|
|
public class BlockDoor extends Block {
|
|
|
|
public static final BlockStateDirection FACING = BlockFacingHorizontal.FACING;
|
|
@@ -171,9 +173,24 @@
|
|
|
|
@Override
|
|
public void doPhysics(IBlockData iblockdata, World world, BlockPosition blockposition, Block block, BlockPosition blockposition1, boolean flag) {
|
|
- boolean flag1 = world.isBlockIndirectlyPowered(blockposition) || world.isBlockIndirectlyPowered(blockposition.shift(iblockdata.get(BlockDoor.HALF) == BlockPropertyDoubleBlockHalf.LOWER ? EnumDirection.UP : EnumDirection.DOWN));
|
|
+ // CraftBukkit start
|
|
+ BlockPosition otherHalf = blockposition.shift(iblockdata.get(BlockDoor.HALF) == BlockPropertyDoubleBlockHalf.LOWER ? EnumDirection.UP : EnumDirection.DOWN);
|
|
+
|
|
+ org.bukkit.World bworld = world.getWorld();
|
|
+ org.bukkit.block.Block bukkitBlock = bworld.getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
|
|
+ org.bukkit.block.Block blockTop = bworld.getBlockAt(otherHalf.getX(), otherHalf.getY(), otherHalf.getZ());
|
|
+
|
|
+ int power = bukkitBlock.getBlockPower();
|
|
+ int powerTop = blockTop.getBlockPower();
|
|
+ if (powerTop > power) power = powerTop;
|
|
+ int oldPower = (Boolean) iblockdata.get(BlockDoor.POWERED) ? 15 : 0;
|
|
+
|
|
+ if (oldPower == 0 ^ power == 0) {
|
|
+ BlockRedstoneEvent eventRedstone = new BlockRedstoneEvent(bukkitBlock, oldPower, power);
|
|
+ world.getServer().getPluginManager().callEvent(eventRedstone);
|
|
|
|
- if (block != this && flag1 != (Boolean) iblockdata.get(BlockDoor.POWERED)) {
|
|
+ boolean flag1 = eventRedstone.getNewCurrent() > 0;
|
|
+ // CraftBukkit end
|
|
if (flag1 != (Boolean) iblockdata.get(BlockDoor.OPEN)) {
|
|
this.b(world, blockposition, flag1);
|
|
}
|