diff options
| author | md_5 <git@md-5.net> | 2016-11-17 12:41:03 +1100 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2016-11-17 12:41:03 +1100 |
| commit | c25ddf063a808e3adb749e22017661f403c5fb7e (patch) | |
| tree | b2efcff512be12fd3e38cf8c36386148ce6ab4ae /nms-patches/BlockRedstoneTorch.patch | |
| parent | 51263e97187a84338f89698eef187284055a682a (diff) | |
| download | craftbukkit-c25ddf063a808e3adb749e22017661f403c5fb7e.tar craftbukkit-c25ddf063a808e3adb749e22017661f403c5fb7e.tar.gz craftbukkit-c25ddf063a808e3adb749e22017661f403c5fb7e.tar.lz craftbukkit-c25ddf063a808e3adb749e22017661f403c5fb7e.tar.xz craftbukkit-c25ddf063a808e3adb749e22017661f403c5fb7e.zip | |
Update to Minecraft 1.11
Diffstat (limited to 'nms-patches/BlockRedstoneTorch.patch')
| -rw-r--r-- | nms-patches/BlockRedstoneTorch.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nms-patches/BlockRedstoneTorch.patch b/nms-patches/BlockRedstoneTorch.patch index f2dd63ce..f74f4350 100644 --- a/nms-patches/BlockRedstoneTorch.patch +++ b/nms-patches/BlockRedstoneTorch.patch @@ -1,15 +1,15 @@ --- a/net/minecraft/server/BlockRedstoneTorch.java +++ b/net/minecraft/server/BlockRedstoneTorch.java -@@ -7,6 +7,8 @@ +@@ -6,6 +6,8 @@ + import java.util.Map; import java.util.Random; - import javax.annotation.Nullable; +import org.bukkit.event.block.BlockRedstoneEvent; // CraftBukkit + public class BlockRedstoneTorch extends BlockTorch { private static final Map<World, List<BlockRedstoneTorch.RedstoneUpdateInfo>> g = Maps.newHashMap(); -@@ -14,7 +16,7 @@ +@@ -13,7 +15,7 @@ private boolean a(World world, BlockPosition blockposition, boolean flag) { if (!BlockRedstoneTorch.g.containsKey(world)) { @@ -18,7 +18,7 @@ } List list = (List) BlockRedstoneTorch.g.get(world); -@@ -97,8 +99,25 @@ +@@ -96,8 +98,25 @@ list.remove(0); } @@ -43,8 +43,8 @@ + // CraftBukkit end world.setTypeAndData(blockposition, Blocks.UNLIT_REDSTONE_TORCH.getBlockData().set(BlockRedstoneTorch.FACING, iblockdata.get(BlockRedstoneTorch.FACING)), 3); if (this.a(world, blockposition, true)) { - world.a((EntityHuman) null, blockposition, SoundEffects.eR, SoundCategory.BLOCKS, 0.5F, 2.6F + (world.random.nextFloat() - world.random.nextFloat()) * 0.8F); -@@ -115,6 +134,15 @@ + world.a((EntityHuman) null, blockposition, SoundEffects.fl, SoundCategory.BLOCKS, 0.5F, 2.6F + (world.random.nextFloat() - world.random.nextFloat()) * 0.8F); +@@ -114,6 +133,15 @@ } } } else if (!flag && !this.a(world, blockposition, false)) { |