mirror of
https://hub.spigotmc.org/stash/scm/spigot/craftbukkit.git
synced 2024-11-25 15:06:14 +00:00
57 lines
2.4 KiB
Diff
57 lines
2.4 KiB
Diff
--- a/net/minecraft/world/level/block/BlockPressurePlateBinary.java
|
|
+++ b/net/minecraft/world/level/block/BlockPressurePlateBinary.java
|
|
@@ -13,6 +13,11 @@
|
|
import net.minecraft.world.level.block.state.properties.BlockSetType;
|
|
import net.minecraft.world.level.block.state.properties.BlockStateBoolean;
|
|
|
|
+// CraftBukkit start
|
|
+import net.minecraft.world.entity.player.EntityHuman;
|
|
+import org.bukkit.event.entity.EntityInteractEvent;
|
|
+// CraftBukkit end
|
|
+
|
|
public class BlockPressurePlateBinary extends BlockPressurePlateAbstract {
|
|
|
|
public static final MapCodec<BlockPressurePlateBinary> CODEC = RecordCodecBuilder.mapCodec((instance) -> {
|
|
@@ -44,7 +49,7 @@
|
|
|
|
@Override
|
|
protected int getSignalStrength(World world, BlockPosition blockposition) {
|
|
- Class oclass;
|
|
+ Class<? extends Entity> oclass; // CraftBukkit
|
|
|
|
switch (this.type.pressurePlateSensitivity()) {
|
|
case EVERYTHING:
|
|
@@ -59,7 +64,31 @@
|
|
|
|
Class<? extends Entity> oclass1 = oclass;
|
|
|
|
- return getEntityCount(world, BlockPressurePlateBinary.TOUCH_AABB.move(blockposition), oclass1) > 0 ? 15 : 0;
|
|
+ // CraftBukkit start - Call interact event when turning on a pressure plate
|
|
+ for (Entity entity : getEntities(world, BlockPressurePlateBinary.TOUCH_AABB.move(blockposition), oclass)) {
|
|
+ if (this.getSignalForState(world.getBlockState(blockposition)) == 0) {
|
|
+ org.bukkit.World bworld = world.getWorld();
|
|
+ org.bukkit.plugin.PluginManager manager = world.getCraftServer().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, 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;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ return 15;
|
|
+ }
|
|
+
|
|
+ return 0;
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
@Override
|