2014-11-29 00:02:15 +01:00
|
|
|
--- ../work/decompile-8eb82bde//net/minecraft/server/BlockRedstoneTorch.java 2014-11-28 17:43:42.949707438 +0000
|
|
|
|
|
+++ src/main/java/net/minecraft/server/BlockRedstoneTorch.java 2014-11-28 17:38:19.000000000 +0000
|
2014-11-25 22:32:16 +01:00
|
|
|
@@ -6,6 +6,8 @@
|
|
|
|
|
import java.util.Map;
|
|
|
|
|
import java.util.Random;
|
|
|
|
|
|
|
|
|
|
+import org.bukkit.event.block.BlockRedstoneEvent; // CraftBukkit
|
|
|
|
|
+
|
|
|
|
|
public class BlockRedstoneTorch extends BlockTorch {
|
|
|
|
|
|
|
|
|
|
private static Map b = Maps.newHashMap();
|
|
|
|
|
@@ -95,9 +97,26 @@
|
|
|
|
|
while (list != null && !list.isEmpty() && world.getTime() - ((RedstoneUpdateInfo) list.get(0)).b > 60L) {
|
|
|
|
|
list.remove(0);
|
|
|
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ // CraftBukkit start
|
|
|
|
|
+ org.bukkit.plugin.PluginManager manager = world.getServer().getPluginManager();
|
|
|
|
|
+ org.bukkit.block.Block block = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
|
|
|
|
|
+ int oldCurrent = this.isOn ? 15 : 0;
|
|
|
|
|
+
|
|
|
|
|
+ BlockRedstoneEvent event = new BlockRedstoneEvent(block, oldCurrent, oldCurrent);
|
|
|
|
|
+ // CraftBukkit end
|
|
|
|
|
|
|
|
|
|
if (this.isOn) {
|
|
|
|
|
if (flag) {
|
|
|
|
|
+ // CraftBukkit start
|
|
|
|
|
+ if (oldCurrent != 0) {
|
|
|
|
|
+ event.setNewCurrent(0);
|
|
|
|
|
+ manager.callEvent(event);
|
|
|
|
|
+ if (event.getNewCurrent() != 0) {
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ // 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);
|
|
|
|
|
@@ -114,6 +133,16 @@
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else if (!flag && !this.a(world, blockposition, false)) {
|
|
|
|
|
+ // CraftBukkit start
|
|
|
|
|
+ if (oldCurrent != 15) {
|
|
|
|
|
+ event.setNewCurrent(15);
|
|
|
|
|
+ manager.callEvent(event);
|
|
|
|
|
+ if (event.getNewCurrent() != 15) {
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ // CraftBukkit end
|
|
|
|
|
+
|
|
|
|
|
world.setTypeAndData(blockposition, Blocks.REDSTONE_TORCH.getBlockData().set(BlockRedstoneTorch.FACING, iblockdata.get(BlockRedstoneTorch.FACING)), 3);
|
|
|
|
|
}
|
|
|
|
|
|
