Upstream
/
Paper
mirror of https://github.com/PaperMC/Paper.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge c49cf409c2 into 37b3891032

This commit is contained in:
Jakub Zacek 2024-04-28 19:02:53 +05:00 committed by GitHub
parent 37b3891032 c49cf409c2
commit 7560e7b969
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 156 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
patches/api/0459-Add-BlockPressChangeEvent.patch Normal file
View File

@ -0,0 +1,82 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jakub Zacek <dawon@dawon.eu>
Date: Thu, 1 Feb 2024 22:15:45 +0100
Subject: [PATCH] Add BlockPressChangeEvent
diff --git a/src/main/java/io/papermc/paper/event/block/BlockPressChangeEvent.java b/src/main/java/io/papermc/paper/event/block/BlockPressChangeEvent.java
new file mode 100644
index 0000000000000000000000000000000000000000..1744a8e47337e6408b2facc03d8070d851ad9be0
--- /dev/null
+++ b/src/main/java/io/papermc/paper/event/block/BlockPressChangeEvent.java
@@ -0,0 +1,70 @@
+package io.papermc.paper.event.block;
+
+import org.bukkit.block.Block;
+import org.bukkit.entity.Entity;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.block.BlockEvent;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Called when a block (e.g. Button or Pressure Plate) is being pressed or released.
+ * <p>
+ * If this event is cancelled for release, the release check will be retried after default press delay for specific block.
+ */
+public class BlockPressChangeEvent extends BlockEvent implements Cancellable {
+
+ private static final HandlerList HANDLER_LIST = new HandlerList();
+
+ private final Entity entity;
+ private final boolean pressed;
+
+ private boolean cancelled;
+
+ @ApiStatus.Internal
+ public BlockPressChangeEvent(@NotNull Block block, @Nullable Entity entity, boolean pressed) {
+ super(block);
+ this.entity = entity;
+ this.pressed = pressed;
+ }
+
+ /**
+ * Returns Entity that caused this block to be pressed. For release this is always null.
+ *
+ * @return Entity that caused this block to be pressed or null for release
+ */
+ public @Nullable Entity getEntity() {
+ return entity;
+ }
+
+ /**
+ * Returns whether this block is being pressed or released
+ *
+ * @return true when pressed, false when released
+ */
+ public boolean isPressed() {
+ return pressed;
+ }
+
+ @Override
+ public boolean isCancelled() {
+ return this.cancelled;
+ }
+
+ @Override
+ public void setCancelled(boolean cancel) {
+ this.cancelled = cancel;
+ }
+
+ @NotNull
+ public HandlerList getHandlers() {
+ return HANDLER_LIST;
+ }
+
+ @NotNull
+ public static HandlerList getHandlerList() {
+ return HANDLER_LIST;
+ }
+}

74
patches/server/1045-Add-BlockPressChangeEvent.patch Normal file
View File

@ -0,0 +1,74 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jakub Zacek <dawon@dawon.eu>
Date: Thu, 1 Feb 2024 22:15:30 +0100
Subject: [PATCH] Add BlockPressChangeEvent
diff --git a/src/main/java/net/minecraft/world/level/block/BasePressurePlateBlock.java b/src/main/java/net/minecraft/world/level/block/BasePressurePlateBlock.java
index 0d573c05f4f8838d4492f749ca473f7a9e8d60dd..e5191f071b8b46756f9c00f2919c055b243b68fb 100644
--- a/src/main/java/net/minecraft/world/level/block/BasePressurePlateBlock.java
+++ b/src/main/java/net/minecraft/world/level/block/BasePressurePlateBlock.java
@@ -97,6 +97,12 @@ public abstract class BasePressurePlateBlock extends Block {
org.bukkit.plugin.PluginManager manager = world.getCraftServer().getPluginManager();
if (flag != flag1) {
+ // Paper start - Add BlockPressChangeEvent
+ if (!new io.papermc.paper.event.block.BlockPressChangeEvent(bworld.getBlockAt(pos.getX(), pos.getY(), pos.getZ()), entity != null ? entity.getBukkitEntity() : null, !flag).callEvent()) {
+ if (flag) world.scheduleTick(new BlockPos(pos), (Block) this, this.getPressedTime());
+ return;
+ }
+ // Paper end - Add BlockPressChangeEvent
BlockRedstoneEvent eventRedstone = new BlockRedstoneEvent(bworld.getBlockAt(pos.getX(), pos.getY(), pos.getZ()), output, j);
manager.callEvent(eventRedstone);
diff --git a/src/main/java/net/minecraft/world/level/block/ButtonBlock.java b/src/main/java/net/minecraft/world/level/block/ButtonBlock.java
index 0118c4ef4f5ed0e724b379b5a563e2b6976803a2..84640dfd7fe1e94715fb38a0e0a1e6a50eb1ff0b 100644
--- a/src/main/java/net/minecraft/world/level/block/ButtonBlock.java
+++ b/src/main/java/net/minecraft/world/level/block/ButtonBlock.java
@@ -141,9 +141,11 @@ public class ButtonBlock extends FaceAttachedHorizontalDirectionalBlock {
return InteractionResult.SUCCESS;
}
// CraftBukkit end
+ if (new io.papermc.paper.event.block.BlockPressChangeEvent(world.getWorld().getBlockAt(pos.getX(), pos.getY(), pos.getZ()), player.getBukkitEntity(), true).callEvent()) { // Paper - Add BlockPressChangeEvent
this.press(state, world, pos);
this.playSound(player, world, pos, true);
world.gameEvent((Entity) player, GameEvent.BLOCK_ACTIVATE, pos);
+ } // Paper - Add BlockPressChangeEvent
return InteractionResult.sidedSuccess(world.isClientSide);
}
}
@@ -151,7 +153,9 @@ public class ButtonBlock extends FaceAttachedHorizontalDirectionalBlock {
@Override
public void onExplosionHit(BlockState state, Level world, BlockPos pos, Explosion explosion, BiConsumer<ItemStack, BlockPos> stackMerger) {
if (explosion.getBlockInteraction() == Explosion.BlockInteraction.TRIGGER_BLOCK && !world.isClientSide() && !(Boolean) state.getValue(ButtonBlock.POWERED)) {
+ if (new io.papermc.paper.event.block.BlockPressChangeEvent(world.getWorld().getBlockAt(pos.getX(), pos.getY(), pos.getZ()), explosion.getDirectSourceEntity() != null ? explosion.getDirectSourceEntity().getBukkitEntity() : null, true).callEvent()) { // Paper - Add BlockPressChangeEvent
this.press(state, world, pos);
+ } // Paper - Add BlockPressChangeEvent
}
super.onExplosionHit(state, world, pos, explosion, stackMerger);
@@ -226,6 +230,11 @@ public class ButtonBlock extends FaceAttachedHorizontalDirectionalBlock {
if (event.isCancelled()) {
return;
}
+ // Paper start - Add BlockPressChangeEvent
+ if (!new io.papermc.paper.event.block.BlockPressChangeEvent(block, entityarrow.getBukkitEntity(), true).callEvent()) {
+ return;
+ }
+ // Paper end - Add BlockPressChangeEvent
}
// CraftBukkit end
@@ -243,6 +252,12 @@ public class ButtonBlock extends FaceAttachedHorizontalDirectionalBlock {
return;
}
// CraftBukkit end
+ // Paper start - Add BlockPressChangeEvent
+ if (!flag && !new io.papermc.paper.event.block.BlockPressChangeEvent(block, null, false).callEvent()) {
+ world.scheduleTick(new BlockPos(pos), (Block) this, this.ticksToStayPressed);
+ return;
+ }
+ // Paper end - Add BlockPressChangeEvent
world.setBlock(pos, (BlockState) state.setValue(ButtonBlock.POWERED, flag), 3);
this.updateNeighbours(state, world, pos);
this.playSound((Player) null, world, pos, flag);