mirror of
https://github.com/barkeser2002/CatServer.git
synced 2026-09-25 10:46:05 +03:00
54 lines
2.1 KiB
Diff
54 lines
2.1 KiB
Diff
--- ../src-base/minecraft/net/minecraft/block/BlockTripWire.java
|
|
+++ ../src-work/minecraft/net/minecraft/block/BlockTripWire.java
|
|
@@ -3,6 +3,9 @@
|
|
import java.util.List;
|
|
import java.util.Random;
|
|
import javax.annotation.Nullable;
|
|
+
|
|
+import org.bukkit.event.entity.EntityInteractEvent;
|
|
+
|
|
import net.minecraft.block.material.Material;
|
|
import net.minecraft.block.properties.IProperty;
|
|
import net.minecraft.block.properties.PropertyBool;
|
|
@@ -181,6 +184,40 @@
|
|
}
|
|
}
|
|
|
|
+ // CraftBukkit start - Call interact even when triggering connected tripwire
|
|
+ if (flag != flag1 && flag1 && (Boolean)iblockstate.getValue(ATTACHED)) {
|
|
+ org.bukkit.World bworld = worldIn.getWorld();
|
|
+ org.bukkit.plugin.PluginManager manager = worldIn.getServer().getPluginManager();
|
|
+ org.bukkit.block.Block block = bworld.getBlockAt(pos.getX(), pos.getY(), pos.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 EntityPlayer) {
|
|
+ cancellable = org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerInteractEvent((EntityPlayer) object, org.bukkit.event.block.Action.PHYSICAL, pos, null, 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)
|
|
{
|
|
iblockstate = iblockstate.withProperty(POWERED, Boolean.valueOf(flag1));
|