2023-06-27 00:35:32 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: by77er <by77er@gmail.com>
|
|
|
|
Date: Mon, 12 Jun 2023 12:56:46 -0400
|
|
|
|
Subject: [PATCH] Add event for player editing sign
|
|
|
|
|
|
|
|
|
2023-07-26 18:25:14 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
|
2023-12-06 17:34:54 +01:00
|
|
|
index ef2f9cae4b06a020f0b9209b69316733df055438..d4df53d022eb58cf43d787ed84bd94fdf1684d69 100644
|
2023-07-26 18:25:14 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
|
2023-12-06 17:34:54 +01:00
|
|
|
@@ -523,7 +523,7 @@ public final class ItemStack {
|
2023-07-26 18:25:14 +02:00
|
|
|
try {
|
|
|
|
if (world.getBlockEntity(SignItem.openSign) instanceof SignBlockEntity tileentitysign) {
|
|
|
|
if (world.getBlockState(SignItem.openSign).getBlock() instanceof SignBlock blocksign) {
|
2023-08-06 02:21:59 +02:00
|
|
|
- blocksign.openTextEdit(entityhuman, tileentitysign, true, org.bukkit.event.player.PlayerSignOpenEvent.Cause.PLACE); // Craftbukkit
|
2023-07-26 18:25:14 +02:00
|
|
|
+ blocksign.openTextEdit(entityhuman, tileentitysign, true, io.papermc.paper.event.player.PlayerOpenSignEvent.Cause.PLACE); // Paper
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} finally {
|
2023-06-27 00:35:32 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/block/SignBlock.java b/src/main/java/net/minecraft/world/level/block/SignBlock.java
|
2023-12-06 17:34:54 +01:00
|
|
|
index 8d7295a949280f233d12d24894cd9dd07af1e325..28cba43e42354b87e08ef87b70c274a2fdc0bb48 100644
|
2023-06-27 00:35:32 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/level/block/SignBlock.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/level/block/SignBlock.java
|
2023-12-06 17:34:54 +01:00
|
|
|
@@ -118,7 +118,7 @@ public abstract class SignBlock extends BaseEntityBlock implements SimpleWaterlo
|
2023-08-06 02:21:59 +02:00
|
|
|
} else if (flag2) {
|
2023-07-26 18:25:14 +02:00
|
|
|
return InteractionResult.SUCCESS;
|
2023-08-06 02:21:59 +02:00
|
|
|
} else if (!this.otherPlayerIsEditingSign(player, tileentitysign) && player.mayBuild() && this.hasEditableText(player, tileentitysign, flag1)) {
|
|
|
|
- this.openTextEdit(player, tileentitysign, flag1, org.bukkit.event.player.PlayerSignOpenEvent.Cause.INTERACT); // CraftBukkit
|
|
|
|
+ this.openTextEdit(player, tileentitysign, flag1, io.papermc.paper.event.player.PlayerOpenSignEvent.Cause.INTERACT); // Paper
|
2023-09-22 18:11:35 +02:00
|
|
|
return this.getInteractionResult(flag);
|
2023-07-26 18:25:14 +02:00
|
|
|
} else {
|
|
|
|
return InteractionResult.PASS;
|
2023-12-06 17:34:54 +01:00
|
|
|
@@ -170,16 +170,33 @@ public abstract class SignBlock extends BaseEntityBlock implements SimpleWaterlo
|
2023-08-06 02:21:59 +02:00
|
|
|
return blockpropertywood;
|
2023-06-27 00:35:32 +02:00
|
|
|
}
|
|
|
|
|
2023-07-26 18:25:14 +02:00
|
|
|
+ @io.papermc.paper.annotation.DoNotUse @Deprecated // Paper
|
2023-06-27 00:35:32 +02:00
|
|
|
public void openTextEdit(Player player, SignBlockEntity blockEntity, boolean front) {
|
2023-08-06 02:21:59 +02:00
|
|
|
- // Craftbukkit start
|
|
|
|
- this.openTextEdit(player, blockEntity, front, org.bukkit.event.player.PlayerSignOpenEvent.Cause.UNKNOWN);
|
2023-09-22 18:11:35 +02:00
|
|
|
- }
|
2023-08-06 02:21:59 +02:00
|
|
|
-
|
|
|
|
- public void openTextEdit(Player entityhuman, SignBlockEntity tileentitysign, boolean flag, org.bukkit.event.player.PlayerSignOpenEvent.Cause cause) {
|
|
|
|
- if (!org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerSignOpenEvent(entityhuman, tileentitysign, flag, cause)) {
|
2023-09-22 18:11:35 +02:00
|
|
|
+ // Paper start - PlayerOpenSignEvent
|
|
|
|
+ this.openTextEdit(player, blockEntity, front, io.papermc.paper.event.player.PlayerOpenSignEvent.Cause.UNKNOWN);
|
|
|
|
+ }
|
2023-08-06 02:21:59 +02:00
|
|
|
+ public void openTextEdit(Player entityhuman, SignBlockEntity tileentitysign, boolean flag, io.papermc.paper.event.player.PlayerOpenSignEvent.Cause cause) {
|
|
|
|
+ org.bukkit.entity.Player bukkitPlayer = (org.bukkit.entity.Player) entityhuman.getBukkitEntity();
|
|
|
|
+ org.bukkit.block.Block bukkitBlock = org.bukkit.craftbukkit.block.CraftBlock.at(tileentitysign.getLevel(), tileentitysign.getBlockPos());
|
2023-06-27 00:35:32 +02:00
|
|
|
+ org.bukkit.craftbukkit.block.CraftSign<?> bukkitSign = (org.bukkit.craftbukkit.block.CraftSign<?>) org.bukkit.craftbukkit.block.CraftBlockStates.getBlockState(bukkitBlock);
|
|
|
|
+ io.papermc.paper.event.player.PlayerOpenSignEvent event = new io.papermc.paper.event.player.PlayerOpenSignEvent(
|
|
|
|
+ bukkitPlayer,
|
|
|
|
+ bukkitSign,
|
2023-08-06 02:21:59 +02:00
|
|
|
+ flag ? org.bukkit.block.sign.Side.FRONT : org.bukkit.block.sign.Side.BACK,
|
2023-07-26 18:25:14 +02:00
|
|
|
+ cause);
|
2023-06-27 00:35:32 +02:00
|
|
|
+ if (!event.callEvent()) return;
|
2023-08-06 02:21:59 +02:00
|
|
|
+ if (org.bukkit.event.player.PlayerSignOpenEvent.getHandlerList().getRegisteredListeners().length > 0) {
|
|
|
|
+ final org.bukkit.event.player.PlayerSignOpenEvent.Cause legacyCause = switch (cause) {
|
|
|
|
+ case PLACE -> org.bukkit.event.player.PlayerSignOpenEvent.Cause.PLACE;
|
|
|
|
+ case PLUGIN -> org.bukkit.event.player.PlayerSignOpenEvent.Cause.PLUGIN;
|
|
|
|
+ case INTERACT -> org.bukkit.event.player.PlayerSignOpenEvent.Cause.INTERACT;
|
|
|
|
+ case UNKNOWN -> org.bukkit.event.player.PlayerSignOpenEvent.Cause.UNKNOWN;
|
|
|
|
+ };
|
|
|
|
+ // Paper end - PlayerOpenSignEvent
|
|
|
|
+ if (!org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerSignOpenEvent(entityhuman, tileentitysign, flag, legacyCause)) { // Paper
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
- // Craftbukkit end
|
|
|
|
+ } // Paper
|
|
|
|
tileentitysign.setAllowedPlayerEditor(entityhuman.getUUID());
|
|
|
|
entityhuman.openTextEdit(tileentitysign, flag);
|
2023-06-27 00:35:32 +02:00
|
|
|
}
|
2023-07-26 18:25:14 +02:00
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
|
2023-11-04 20:20:01 +01:00
|
|
|
index 94caa0915e1a9ec1c46c7a0380db840901cc8063..3b33aed51a84ee30b1e7bceecb0d3840866e0748 100644
|
2023-07-26 18:25:14 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
|
2023-09-29 02:28:26 +02:00
|
|
|
@@ -139,9 +139,15 @@ public class CraftSign<T extends SignBlockEntity> extends CraftBlockEntityState<
|
2023-08-14 01:32:51 +02:00
|
|
|
Preconditions.checkArgument(sign.isPlaced(), "Sign must be placed");
|
|
|
|
Preconditions.checkArgument(sign.getWorld() == player.getWorld(), "Sign must be in same world as Player");
|
2023-07-26 18:25:14 +02:00
|
|
|
|
|
|
|
+ // Paper start
|
|
|
|
+ io.papermc.paper.event.player.PlayerOpenSignEvent event = new io.papermc.paper.event.player.PlayerOpenSignEvent((Player) player, sign, side, io.papermc.paper.event.player.PlayerOpenSignEvent.Cause.PLUGIN);
|
|
|
|
+ if (!event.callEvent()) return;
|
2023-08-06 02:21:59 +02:00
|
|
|
+ if (PlayerSignOpenEvent.getHandlerList().getRegisteredListeners().length > 0) {
|
|
|
|
+ // Paper end
|
|
|
|
if (!CraftEventFactory.callPlayerSignOpenEvent(player, sign, side, PlayerSignOpenEvent.Cause.PLUGIN)) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
+ } // Paper
|
|
|
|
|
2023-08-14 01:32:51 +02:00
|
|
|
SignBlockEntity handle = ((CraftSign<?>) sign).getTileEntity();
|
|
|
|
handle.setAllowedPlayerEditor(player.getUniqueId());
|