Implement suggested naming changes

PaperMC · Jan 11, 2025 · fd457fc · fd457fc
1 parent 10953c1
commit fd457fc
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/paper-api/src/main/java/io/papermc/paper/event/packet/UncheckedSignChangeEvent.java b/paper-api/src/main/java/io/papermc/paper/event/packet/UncheckedSignChangeEvent.java
@@ -24,14 +24,14 @@ public class UncheckedSignChangeEvent extends PlayerEvent implements Cancellable
 
     private static final HandlerList HANDLER_LIST = new HandlerList();
     private boolean cancel = false;
-    private final BlockPosition block;
+    private final BlockPosition editedBlockPosition;
     private final Side side;
     private final List<Component> lines;
 
     @ApiStatus.Internal
-    public UncheckedSignChangeEvent(final Player editor, final BlockPosition block, final Side side, final List<Component> lines) {
+    public UncheckedSignChangeEvent(final Player editor, final BlockPosition editedBlockPosition, final Side side, final List<Component> lines) {
         super(editor);
-        this.block = block;
+        this.editedBlockPosition = editedBlockPosition;
         this.side = side;
         this.lines = lines;
     }
@@ -41,8 +41,8 @@ public UncheckedSignChangeEvent(final Player editor, final BlockPosition block,
      *
      * @return location where the change happened
      */
-    public BlockPosition getBlock() {
-        return block;
+    public BlockPosition getEditedBlockPosition() {
+        return editedBlockPosition;
     }
 
     /**
@@ -59,7 +59,7 @@ public Side getSide() {
      *
      * @return the lines
      */
-    public @Unmodifiable List<Component> getLines() {
+    public @Unmodifiable List<Component> lines() {
         return lines;
     }
 

diff --git a/paper-api/src/main/java/org/bukkit/entity/Player.java b/paper-api/src/main/java/org/bukkit/entity/Player.java
@@ -10,7 +10,7 @@
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import io.papermc.paper.entity.LookAnchor;
-import io.papermc.paper.math.BlockPosition;
+import io.papermc.paper.math.Position;
 import org.bukkit.BanEntry;
 import org.bukkit.DyeColor;
 import org.bukkit.Effect;
@@ -51,7 +51,6 @@
 import org.bukkit.plugin.messaging.PluginMessageRecipient;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
-import org.bukkit.profile.PlayerProfile;
 import org.bukkit.scoreboard.Scoreboard;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
@@ -3487,8 +3486,9 @@ default void setNoTickViewDistance(int viewDistance) {
      *
      * @param block The block where the client has a sign placed
      * @param side The side to edit
+     * @see io.papermc.paper.event.packet.UncheckedSignChangeEvent
      */
-    void openLocalSign(@NotNull BlockPosition block, @NotNull Side side);
+    void openVirtualSign(@NotNull Position block, @NotNull Side side);
 
     /**
      * Shows the demo screen to the player, this screen is normally only seen in

diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -8,7 +8,7 @@
 import io.netty.buffer.Unpooled;
 import io.papermc.paper.FeatureHooks;
 import io.papermc.paper.entity.LookAnchor;
-import io.papermc.paper.math.BlockPosition;
+import io.papermc.paper.math.Position;
 import io.papermc.paper.util.MCUtil;
 import it.unimi.dsi.fastutil.shorts.ShortArraySet;
 import it.unimi.dsi.fastutil.shorts.ShortSet;
@@ -3065,8 +3065,10 @@ public void openSign(@NotNull Sign sign, @NotNull Side side) {
     }
 
     @Override
-    public void openLocalSign(@NotNull BlockPosition block, @NotNull Side side) {
-        getHandle().connection.send(new ClientboundOpenSignEditorPacket(MCUtil.toBlockPos(block), side == Side.FRONT));
+    public void openVirtualSign(@NotNull Position block, @NotNull Side side) {
+        if (this.getHandle().connection == null) return;
+
+        this.getHandle().connection.send(new ClientboundOpenSignEditorPacket(MCUtil.toBlockPos(block), side == Side.FRONT));
     }
 
     @Override