diff options
Diffstat (limited to 'patches/server/0592-Fix-commands-from-signs-not-firing-command-events.patch')
| -rw-r--r-- | patches/server/0592-Fix-commands-from-signs-not-firing-command-events.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0592-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0592-Fix-commands-from-signs-not-firing-command-events.patch index 5303dcde05..67851c6f82 100644 --- a/patches/server/0592-Fix-commands-from-signs-not-firing-command-events.patch +++ b/patches/server/0592-Fix-commands-from-signs-not-firing-command-events.patch @@ -58,7 +58,7 @@ index 0000000000000000000000000000000000000000..01a2bc1feec808790bb93618ce46adb9 + } +} diff --git a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java -index 9939cad5af2d7873f188f18978029663a8d785de..c79a80428961b0941d4f6ed31d641cbf0e6a7203 100644 +index 9939cad5af2d7873f188f18978029663a8d785de..f3cea7a8de334419b4a2f6dc64ef0e20fd715e75 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java @@ -273,7 +273,17 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C @@ -71,7 +71,7 @@ index 9939cad5af2d7873f188f18978029663a8d785de..c79a80428961b0941d4f6ed31d641cbf + if (org.spigotmc.SpigotConfig.logCommands) { + LOGGER.info("{} issued server command: {}", player.getScoreboardName(), command); + } -+ io.papermc.paper.event.player.PlayerSignCommandPreprocessEvent event = new io.papermc.paper.event.player.PlayerSignCommandPreprocessEvent((org.bukkit.entity.Player) player.getBukkitEntity(), command, new org.bukkit.craftbukkit.util.LazyPlayerSet(player.getServer()), (org.bukkit.block.Sign) io.papermc.paper.util.MCUtil.toBukkitBlock(this.level, this.worldPosition).getState(), front ? Side.FRONT : Side.BACK); ++ io.papermc.paper.event.player.PlayerSignCommandPreprocessEvent event = new io.papermc.paper.event.player.PlayerSignCommandPreprocessEvent((org.bukkit.entity.Player) player.getBukkitEntity(), command, new org.bukkit.craftbukkit.util.LazyPlayerSet(player.getServer()), (org.bukkit.block.Sign) CraftBlock.at(this.level, this.worldPosition).getState(), front ? Side.FRONT : Side.BACK); + if (!event.callEvent()) { + return false; + } |