2014-11-29 00:02:15 +01:00
|
|
|
--- ../work/decompile-8eb82bde//net/minecraft/server/BlockPressurePlateBinary.java 2014-11-28 17:43:42.941707438 +0000
|
|
|
|
|
+++ src/main/java/net/minecraft/server/BlockPressurePlateBinary.java 2014-11-28 17:38:20.000000000 +0000
|
2014-11-25 22:32:16 +01:00
|
|
|
@@ -3,6 +3,8 @@
|
|
|
|
|
import java.util.Iterator;
|
|
|
|
|
import java.util.List;
|
|
|
|
|
|
|
|
|
|
+import org.bukkit.event.entity.EntityInteractEvent; // CraftBukkit
|
|
|
|
|
+
|
|
|
|
|
public class BlockPressurePlateBinary extends BlockPressurePlateAbstract {
|
|
|
|
|
|
|
|
|
|
public static final BlockStateBoolean POWERED = BlockStateBoolean.of("powered");
|
|
|
|
|
@@ -44,6 +46,26 @@
|
|
|
|
|
|
|
|
|
|
while (iterator.hasNext()) {
|
|
|
|
|
Entity entity = (Entity) iterator.next();
|
|
|
|
|
+
|
|
|
|
|
+ // CraftBukkit start - Call interact event when turning on a pressure plate
|
|
|
|
|
+ if (this.e(world.getType(blockposition)) == 0) {
|
|
|
|
|
+ org.bukkit.World bworld = world.getWorld();
|
|
|
|
|
+ org.bukkit.plugin.PluginManager manager = world.getServer().getPluginManager();
|
|
|
|
|
+ org.bukkit.event.Cancellable cancellable;
|
|
|
|
|
+
|
|
|
|
|
+ if (entity instanceof EntityHuman) {
|
|
|
|
|
+ cancellable = org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerInteractEvent((EntityHuman) entity, org.bukkit.event.block.Action.PHYSICAL, blockposition, null, null);
|
|
|
|
|
+ } else {
|
|
|
|
|
+ cancellable = new EntityInteractEvent(entity.getBukkitEntity(), bworld.getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()));
|
|
|
|
|
+ manager.callEvent((EntityInteractEvent) cancellable);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ // We only want to block turning the plate on if all events are cancelled
|
|
|
|
|
+ if (cancellable.isCancelled()) {
|
|
|
|
|
+ continue;
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ // CraftBukkit end
|
|
|
|
|
|
|
|
|
|
if (!entity.aH()) {
|
|
|
|
|
return 15;
|
