summaryrefslogtreecommitdiffstats
path: root/nms-patches/BlockRedstoneTorch.patch
diff options
context:
space:
mode:
Diffstat (limited to 'nms-patches/BlockRedstoneTorch.patch')
-rw-r--r--nms-patches/BlockRedstoneTorch.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/nms-patches/BlockRedstoneTorch.patch b/nms-patches/BlockRedstoneTorch.patch
index 2eea0e70..03c40f3c 100644
--- a/nms-patches/BlockRedstoneTorch.patch
+++ b/nms-patches/BlockRedstoneTorch.patch
@@ -8,16 +8,16 @@
+
public class BlockRedstoneTorch extends BlockTorch {
- private static Map<World, List<BlockRedstoneTorch.RedstoneUpdateInfo>> b = Maps.newHashMap();
+ private static Map<World, List<BlockRedstoneTorch.RedstoneUpdateInfo>> g = Maps.newHashMap();
@@ -13,7 +15,7 @@
private boolean a(World world, BlockPosition blockposition, boolean flag) {
- if (!BlockRedstoneTorch.b.containsKey(world)) {
-- BlockRedstoneTorch.b.put(world, Lists.newArrayList());
-+ BlockRedstoneTorch.b.put(world, Lists.<BlockRedstoneTorch.RedstoneUpdateInfo>newArrayList()); // CraftBukkit - fix decompile error
+ if (!BlockRedstoneTorch.g.containsKey(world)) {
+- BlockRedstoneTorch.g.put(world, Lists.newArrayList());
++ BlockRedstoneTorch.g.put(world, Lists.<BlockRedstoneTorch.RedstoneUpdateInfo>newArrayList()); // CraftBukkit - fix decompile error
}
- List list = (List) BlockRedstoneTorch.b.get(world);
+ List list = (List) BlockRedstoneTorch.g.get(world);
@@ -96,8 +98,25 @@
list.remove(0);
}
@@ -43,7 +43,7 @@
+ // 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.makeSound((double) ((float) blockposition.getX() + 0.5F), (double) ((float) blockposition.getY() + 0.5F), (double) ((float) blockposition.getZ() + 0.5F), "random.fizz", 0.5F, 2.6F + (world.random.nextFloat() - world.random.nextFloat()) * 0.8F);
+ world.a((EntityHuman) null, blockposition, SoundEffects.eF, SoundCategory.BLOCKS, 0.5F, 2.6F + (world.random.nextFloat() - world.random.nextFloat()) * 0.8F);
@@ -114,6 +133,15 @@
}
}