mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-29 19:52:55 +01:00
43 lines
1.9 KiB
Diff
43 lines
1.9 KiB
Diff
--- ../work/decompile-8eb82bde//net/minecraft/server/BlockPressurePlateWeighted.java 2014-11-28 17:43:42.945707438 +0000
|
|
+++ src/main/java/net/minecraft/server/BlockPressurePlateWeighted.java 2014-11-28 17:38:19.000000000 +0000
|
|
@@ -1,5 +1,7 @@
|
|
package net.minecraft.server;
|
|
|
|
+import org.bukkit.event.entity.EntityInteractEvent; // CraftBukkit
|
|
+
|
|
public class BlockPressurePlateWeighted extends BlockPressurePlateAbstract {
|
|
|
|
public static final BlockStateInteger POWER = BlockStateInteger.of("power", 0, 15);
|
|
@@ -12,7 +14,31 @@
|
|
}
|
|
|
|
protected int e(World world, BlockPosition blockposition) {
|
|
- int i = Math.min(world.a(Entity.class, this.a(blockposition)).size(), this.b);
|
|
+ // CraftBukkit start
|
|
+ //int i = Math.min(world.a(Entity.class, this.a(blockposition)).size(), this.b);
|
|
+ int i = 0;
|
|
+ java.util.Iterator iterator = world.a(Entity.class, this.a(blockposition)).iterator();
|
|
+
|
|
+ while (iterator.hasNext()) {
|
|
+ Entity entity = (Entity) iterator.next();
|
|
+
|
|
+ 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(), world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()));
|
|
+ world.getServer().getPluginManager().callEvent((EntityInteractEvent) cancellable);
|
|
+ }
|
|
+
|
|
+ // We only want to block turning the plate on if all events are cancelled
|
|
+ if (!cancellable.isCancelled()) {
|
|
+ i++;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ i = Math.min(i, this.b);
|
|
+ // CraftBukkit end
|
|
|
|
if (i > 0) {
|
|
float f = (float) Math.min(this.b, i) / (float) this.b;
|