diff options
Diffstat (limited to 'nms-patches/BlockDoor.patch')
| -rw-r--r-- | nms-patches/BlockDoor.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nms-patches/BlockDoor.patch b/nms-patches/BlockDoor.patch index 5f6752c0..2e1dfe91 100644 --- a/nms-patches/BlockDoor.patch +++ b/nms-patches/BlockDoor.patch @@ -1,21 +1,21 @@ --- a/net/minecraft/server/BlockDoor.java +++ b/net/minecraft/server/BlockDoor.java -@@ -3,6 +3,8 @@ - import com.google.common.base.Predicate; +@@ -2,6 +2,8 @@ + import java.util.Random; +import org.bukkit.event.block.BlockRedstoneEvent; // CraftBukkit + public class BlockDoor extends Block { - public static final BlockStateDirection FACING = BlockStateDirection.of("facing", (Predicate) EnumDirection.EnumDirectionLimit.HORIZONTAL); -@@ -155,9 +157,22 @@ + public static final BlockStateDirection FACING = BlockFacingHorizontal.FACING; +@@ -137,9 +139,22 @@ this.b(world, blockposition, iblockdata, 0); } } else { - boolean flag1 = world.isBlockIndirectlyPowered(blockposition) || world.isBlockIndirectlyPowered(blockposition2); -- if ((flag1 || block.isPowerSource()) && block != this && flag1 != ((Boolean) iblockdata2.get(BlockDoor.POWERED)).booleanValue()) { +- if (block != this && (flag1 || block.getBlockData().m()) && flag1 != ((Boolean) iblockdata2.get(BlockDoor.POWERED)).booleanValue()) { + // CraftBukkit start + org.bukkit.World bworld = world.getWorld(); + org.bukkit.block.Block bukkitBlock = bworld.getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()); @@ -34,8 +34,8 @@ world.setTypeAndData(blockposition2, iblockdata2.set(BlockDoor.POWERED, Boolean.valueOf(flag1)), 2); if (flag1 != ((Boolean) iblockdata.get(BlockDoor.OPEN)).booleanValue()) { world.setTypeAndData(blockposition, iblockdata.set(BlockDoor.OPEN, Boolean.valueOf(flag1)), 2); -@@ -165,6 +180,7 @@ - world.a((EntityHuman) null, flag1 ? 1003 : 1006, blockposition, 0); +@@ -147,6 +162,7 @@ + world.a((EntityHuman) null, flag1 ? this.g() : this.e(), blockposition, 0); } } + // CraftBukkit end |