Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-29 12:27:59 +01:00
Code Issues Projects Releases Wiki Activity

add side to PlayerSignCommandPreprocessEvent

Browse Source
This commit is contained in:
Jake Potrebic 2023-06-08 22:57:24 -07:00
parent e450f54015
commit 6dfe9ac1d8
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
patches/api/Add-PlayerSignCommandPreprocessEvent.patch
View File

@ -13,14 +13,16 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+package io.papermc.paper.event.player; +package io.papermc.paper.event.player;
+ +
+import org.bukkit.block.Sign; +import org.bukkit.block.Sign;
+import org.bukkit.block.sign.Side;
+import org.bukkit.entity.Player; +import org.bukkit.entity.Player;
+import org.bukkit.event.player.PlayerCommandPreprocessEvent; +import org.bukkit.event.player.PlayerCommandPreprocessEvent;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.NotNull;
+ +
+import java.util.Set; +import java.util.Set;
+ +
+/** +/**
+ * Called when a {@link Player} clicks a sign that causes a command to run. + * Called when a {@link Player} clicks a side on a sign that causes a command to run.
+ * <p> + * <p>
+ * This command is run with elevated permissions which allows players to access commands on signs they wouldn't + * This command is run with elevated permissions which allows players to access commands on signs they wouldn't
+ * normally be able to run. + * normally be able to run.
@ -28,10 +30,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+public class PlayerSignCommandPreprocessEvent extends PlayerCommandPreprocessEvent { +public class PlayerSignCommandPreprocessEvent extends PlayerCommandPreprocessEvent {
+ +
+ private final Sign sign; + private final Sign sign;
+ private final Side side;
+ +
+ public PlayerSignCommandPreprocessEvent(@NotNull Player player, @NotNull String message, @NotNull Set<Player> recipients, @NotNull Sign sign) { + @ApiStatus.Internal
+ public PlayerSignCommandPreprocessEvent(@NotNull Player player, @NotNull String message, @NotNull Set<Player> recipients, @NotNull Sign sign, final Side side) {
+ super(player, message, recipients); + super(player, message, recipients);
+ this.sign = sign; + this.sign = sign;
+ this.side = side;
+ } + }
+ +
+ /** + /**
@ -39,8 +44,16 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ * + *
+ * @return the sign + * @return the sign
+ */ + */
+ @NotNull + public @NotNull Sign getSign() {
+ public Sign getSign() { + return this.sign;
+ return sign; + }
+
+ /**
+ * Gets the side of the sign that the command originated from.
+ *
+ * @return the sign side
+ */
+ public @NotNull Side getSide() {
+ return this.side;
+ } + }
+} +}

2
patches/server/Fix-commands-from-signs-not-firing-command-events.patch
View File

@ -71,7 +71,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ if (org.spigotmc.SpigotConfig.logCommands) { + if (org.spigotmc.SpigotConfig.logCommands) {
+ LOGGER.info("{} issued server command: {}", player.getScoreboardName(), command); + 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()); + 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);
+ if (!event.callEvent()) { + if (!event.callEvent()) {
+ return false; + return false;
+ } + }

1
patches/server/Setup-Gradle-project.patch
View File

@ -136,6 +136,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ if (providers.gradleProperty("paper.runDisableWatchdog").getOrElse("false") == "true") { + if (providers.gradleProperty("paper.runDisableWatchdog").getOrElse("false") == "true") {
+ systemProperty("disable.watchdog", true) + systemProperty("disable.watchdog", true)
+ } + }
+ systemProperty("io.papermc.paper.suppress.sout.nags", true)
+ +
+ val memoryGb = providers.gradleProperty("paper.runMemoryGb").getOrElse("2") + val memoryGb = providers.gradleProperty("paper.runMemoryGb").getOrElse("2")
+ minHeapSize = "${memoryGb}G" + minHeapSize = "${memoryGb}G"