53 lines
2.2 KiB
Diff
53 lines
2.2 KiB
Diff
|
--- a/net/minecraft/server/BlockTripwire.java
|
||
|
|
+++ b/net/minecraft/server/BlockTripwire.java
|
||
|
|
@@ -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");
|
||
|
|
@@ -155,6 +157,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));
|
||
|
|
world.setTypeAndData(blockposition, iblockdata, 3);
|