2014-11-29 00:02:15 +01:00
|
|
|
--- ../work/decompile-8eb82bde//net/minecraft/server/BlockTripwire.java 2014-11-28 17:43:42.977707438 +0000
|
|
|
|
|
+++ src/main/java/net/minecraft/server/BlockTripwire.java 2014-11-28 17:38:18.000000000 +0000
|
2014-11-25 22:32:16 +01:00
|
|
|
@@ -4,6 +4,8 @@
|
|
|
|
|
import java.util.List;
|
|
|
|
|
import java.util.Random;
|
|
|
|
|
|
|
|
|
|
+import org.bukkit.event.entity.EntityInteractEvent; // CraftBukkit
|
|
|
|
|
+
|
|
|
|
|
public class BlockTripwire extends Block {
|
|
|
|
|
|
|
|
|
|
public static final BlockStateBoolean POWERED = BlockStateBoolean.of("powered");
|
|
|
|
|
@@ -154,6 +156,40 @@
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ // CraftBukkit start - Call interact even when triggering connected tripwire
|
|
|
|
|
+ if (flag != flag1 && flag1 && (Boolean)iblockdata.get(ATTACHED)) {
|
|
|
|
|
+ org.bukkit.World bworld = world.getWorld();
|
|
|
|
|
+ org.bukkit.plugin.PluginManager manager = world.getServer().getPluginManager();
|
|
|
|
|
+ org.bukkit.block.Block block = bworld.getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
|
|
|
|
|
+ boolean allowed = false;
|
|
|
|
|
+
|
|
|
|
|
+ // If all of the events are cancelled block the tripwire trigger, else allow
|
|
|
|
|
+ for (Object object : list) {
|
|
|
|
|
+ if (object != null) {
|
|
|
|
|
+ org.bukkit.event.Cancellable cancellable;
|
|
|
|
|
+
|
|
|
|
|
+ if (object instanceof EntityHuman) {
|
|
|
|
|
+ cancellable = org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerInteractEvent((EntityHuman) object, org.bukkit.event.block.Action.PHYSICAL, blockposition, null, null);
|
|
|
|
|
+ } else if (object instanceof Entity) {
|
|
|
|
|
+ cancellable = new EntityInteractEvent(((Entity) object).getBukkitEntity(), block);
|
|
|
|
|
+ manager.callEvent((EntityInteractEvent) cancellable);
|
|
|
|
|
+ } else {
|
|
|
|
|
+ continue;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ if (!cancellable.isCancelled()) {
|
|
|
|
|
+ allowed = true;
|
|
|
|
|
+ break;
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ if (!allowed) {
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ // CraftBukkit end
|
|
|
|
|
|
|
|
|
|
if (flag1 != flag) {
|
|
|
|
|
iblockdata = iblockdata.set(BlockTripwire.POWERED, Boolean.valueOf(flag1));
|
