From c8ec88128b82d4cc618136f9da33f048ef1b199d Mon Sep 17 00:00:00 2001
From: Clexus <528373858@qq.com>
Date: Fri, 22 May 2026 18:22:10 +0800
Subject: [PATCH 01/11] Expose relative parameters to setRotation

---
 paper-api/src/main/java/org/bukkit/entity/Entity.java  | 10 ++++++++++
 paper-api/src/main/java/org/bukkit/entity/Player.java  | 10 ++++++++++
 .../org/bukkit/craftbukkit/entity/CraftEntity.java     |  8 ++++++++
 .../org/bukkit/craftbukkit/entity/CraftPlayer.java     |  7 +++++++
 4 files changed, 35 insertions(+)

diff --git a/paper-api/src/main/java/org/bukkit/entity/Entity.java b/paper-api/src/main/java/org/bukkit/entity/Entity.java
index 2c68aae864a7..e2205b6bdf66 100644
--- a/paper-api/src/main/java/org/bukkit/entity/Entity.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Entity.java
@@ -135,6 +135,16 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
      */
     public void setRotation(float yaw, float pitch);
 
+    /**
+     * Sets the entity's rotation.
+     *
+     * @param yaw the yaw
+     * @param relativeYaw whether the yaw is relative to the current yaw
+     * @param pitch the pitch
+     * @param relativePitch whether the pitch is relative to the current pitch
+     */
+    void setRotation(float yaw, boolean relativeYaw, float pitch, boolean relativePitch);
+
     // Paper start - Teleport API
     /**
      * Teleports this entity to the given location.
diff --git a/paper-api/src/main/java/org/bukkit/entity/Player.java b/paper-api/src/main/java/org/bukkit/entity/Player.java
index fe3f4b7552e1..5fadc9053c0a 100644
--- a/paper-api/src/main/java/org/bukkit/entity/Player.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Player.java
@@ -3795,6 +3795,16 @@ public int getPing() {
      */
     void setRotation(float yaw, float pitch);
 
+    /**
+     * Sets the player's rotation.
+     *
+     * @param yaw the yaw
+     * @param relativeYaw whether the yaw is relative to the current yaw
+     * @param pitch the pitch
+     * @param relativePitch whether the pitch is relative to the current pitch
+     */
+    void setRotation(float yaw, boolean relativeYaw, float pitch, boolean relativePitch);
+
     /**
      * Causes the player to look towards the given entity.
      *
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 2f40476da09c..05573d9f99ac 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -277,6 +277,14 @@ public void setRotation(float yaw, float pitch) {
         this.getHandle().forceSetRotation(yaw, false, pitch, false);
     }
 
+    @Override
+    public void setRotation(float yaw, final boolean relativeYaw, float pitch, final boolean relativePitch) {
+        NumberConversions.checkFinite(pitch, "pitch not finite");
+        NumberConversions.checkFinite(yaw, "yaw not finite");
+
+        this.getHandle().forceSetRotation(yaw, relativeYaw, pitch, relativePitch);
+    }
+
     @Override
     public boolean teleport(Location location) {
         return this.teleport(location, TeleportCause.PLUGIN);
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
index 2e95fee39986..3fbbfc6bf0b0 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1299,6 +1299,13 @@ public void setRotation(float yaw, float pitch) {
         super.setRotation(yaw, pitch);
     }
 
+    @Override
+    public void setRotation(final float yaw, final boolean relativeYaw, final float pitch, final boolean relativePitch) {
+        if (this.getHandle().connection == null) return;
+
+        super.setRotation(yaw, relativeYaw, pitch, relativePitch);
+    }
+
     @Override
     public void lookAt(org.bukkit.entity.@NonNull Entity entity, @NonNull LookAnchor playerAnchor, @NonNull LookAnchor entityAnchor) {
         this.getHandle().lookAt(toNmsAnchor(playerAnchor), ((CraftEntity) entity).getHandle(), toNmsAnchor(entityAnchor));

From 50c68b1ec9306ad82fff2b7a741cb5a25754d5cc Mon Sep 17 00:00:00 2001
From: Clexus <528373858@qq.com>
Date: Fri, 22 May 2026 19:10:12 +0800
Subject: [PATCH 02/11] Add note

---
 paper-api/src/main/java/org/bukkit/entity/Player.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/paper-api/src/main/java/org/bukkit/entity/Player.java b/paper-api/src/main/java/org/bukkit/entity/Player.java
index 5fadc9053c0a..f98d0bc69375 100644
--- a/paper-api/src/main/java/org/bukkit/entity/Player.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Player.java
@@ -3796,14 +3796,18 @@ public int getPing() {
     void setRotation(float yaw, float pitch);
 
     /**
-     * Sets the player's rotation.
+     * Modify the player's rotation.
+     * <p>
+     * Note: When relative parameters are set, client will do interpolations to
+     * make the rotation smooth, it's different from just send a new rotation with
+     * yaw or pitch addition.
      *
      * @param yaw the yaw
      * @param relativeYaw whether the yaw is relative to the current yaw
      * @param pitch the pitch
      * @param relativePitch whether the pitch is relative to the current pitch
      */
-    void setRotation(float yaw, boolean relativeYaw, float pitch, boolean relativePitch);
+    void modRotation(float yaw, boolean relativeYaw, float pitch, boolean relativePitch);
 
     /**
      * Causes the player to look towards the given entity.

From f6da67a36a6d4d29b6ef4ee67ecd622a46de51bd Mon Sep 17 00:00:00 2001
From: Clexus <528373858@qq.com>
Date: Fri, 22 May 2026 19:14:28 +0800
Subject: [PATCH 03/11] Wrongly renamed

---
 paper-api/src/main/java/org/bukkit/entity/Player.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/paper-api/src/main/java/org/bukkit/entity/Player.java b/paper-api/src/main/java/org/bukkit/entity/Player.java
index f98d0bc69375..73e594669ea0 100644
--- a/paper-api/src/main/java/org/bukkit/entity/Player.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Player.java
@@ -3807,7 +3807,7 @@ public int getPing() {
      * @param pitch the pitch
      * @param relativePitch whether the pitch is relative to the current pitch
      */
-    void modRotation(float yaw, boolean relativeYaw, float pitch, boolean relativePitch);
+    void setRotation(float yaw, boolean relativeYaw, float pitch, boolean relativePitch);
 
     /**
      * Causes the player to look towards the given entity.

From 7e8505f3616b499ba3cc9212b59979e35e840848 Mon Sep 17 00:00:00 2001
From: Clexus <528373858@qq.com>
Date: Fri, 22 May 2026 19:17:02 +0800
Subject: [PATCH 04/11] Wrongly renamed 2

---
 paper-api/src/main/java/org/bukkit/entity/Player.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/paper-api/src/main/java/org/bukkit/entity/Player.java b/paper-api/src/main/java/org/bukkit/entity/Player.java
index 73e594669ea0..3dc58808ad0d 100644
--- a/paper-api/src/main/java/org/bukkit/entity/Player.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Player.java
@@ -3796,7 +3796,7 @@ public int getPing() {
     void setRotation(float yaw, float pitch);
 
     /**
-     * Modify the player's rotation.
+     * Set the player's rotation.
      * <p>
      * Note: When relative parameters are set, client will do interpolations to
      * make the rotation smooth, it's different from just send a new rotation with

From e6ca60a5a416be45580aa4951659b2aa337c527c Mon Sep 17 00:00:00 2001
From: Clexus <528373858@qq.com>
Date: Sun, 19 Jul 2026 12:19:56 +0800
Subject: [PATCH 05/11] Add angle for clearer meaning

---
 .../java/io/papermc/paper/math/Angle.java     | 47 +++++++++++++++++++
 .../java/io/papermc/paper/math/AngleImpl.java |  4 ++
 .../main/java/org/bukkit/entity/Entity.java   |  9 ++--
 .../main/java/org/bukkit/entity/Player.java   | 13 ++---
 .../craftbukkit/entity/CraftEntity.java       | 12 +++--
 .../craftbukkit/entity/CraftPlayer.java       |  5 +-
 6 files changed, 75 insertions(+), 15 deletions(-)
 create mode 100644 paper-api/src/main/java/io/papermc/paper/math/Angle.java
 create mode 100644 paper-api/src/main/java/io/papermc/paper/math/AngleImpl.java

diff --git a/paper-api/src/main/java/io/papermc/paper/math/Angle.java b/paper-api/src/main/java/io/papermc/paper/math/Angle.java
new file mode 100644
index 000000000000..5ce3041c93c8
--- /dev/null
+++ b/paper-api/src/main/java/io/papermc/paper/math/Angle.java
@@ -0,0 +1,47 @@
+package io.papermc.paper.math;
+
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Represents an angle that can be relative or absolute.
+ */
+@NullMarked
+public interface Angle {
+
+    /**
+     * Creates a new absolute angle with the specified value. Absolute
+     * angles are regardless of the current orientation.
+     *
+     * @param degrees the angle value, measured in degrees
+     * @return a new {@code Angle} instance with the specified value
+     */
+    static Angle absolute(float degrees) {
+        return new AngleImpl(degrees, false);
+    }
+
+    /**
+     * Creates a new relative angle with the specified value. Relative
+     * angles are relative to the current orientation.
+     *
+     * @param degrees the angle value, measured in degrees
+     * @return a new {@code Angle} instance with the specified value
+     */
+    static Angle relative(float degrees) {
+        return new AngleImpl(degrees, true);
+    }
+
+    /**
+     * Retrieves the value of the angle, measured in degrees.
+     *
+     * @return the angle value in degrees
+     */
+    float degrees();
+
+
+    /**
+     * Determines whether the angle is relative or absolute.
+     *
+     * @return {@code true} if the angle is relative, {@code false} if it is absolute
+     */
+    boolean relative();
+}
diff --git a/paper-api/src/main/java/io/papermc/paper/math/AngleImpl.java b/paper-api/src/main/java/io/papermc/paper/math/AngleImpl.java
new file mode 100644
index 000000000000..312f060049bc
--- /dev/null
+++ b/paper-api/src/main/java/io/papermc/paper/math/AngleImpl.java
@@ -0,0 +1,4 @@
+package io.papermc.paper.math;
+
+public record AngleImpl(float degrees, boolean relative) implements Angle {
+}
diff --git a/paper-api/src/main/java/org/bukkit/entity/Entity.java b/paper-api/src/main/java/org/bukkit/entity/Entity.java
index e692318a3ad4..4cca850f7993 100644
--- a/paper-api/src/main/java/org/bukkit/entity/Entity.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Entity.java
@@ -5,6 +5,7 @@
 import java.util.UUID;
 import io.papermc.paper.datacomponent.DataComponentView;
 import io.papermc.paper.entity.LookAnchor;
+import io.papermc.paper.math.Angle;
 import net.kyori.adventure.text.event.HoverEvent;
 import net.kyori.adventure.text.event.HoverEventSource;
 import net.kyori.adventure.util.TriState;
@@ -133,20 +134,22 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
      * <p>
      * Note that if the entity is affected by AI, it may override this rotation.
      *
+     * @deprecated in favor of {@link #setRotation(Angle, Angle)}
      * @param yaw the yaw
      * @param pitch the pitch
      */
+    @Deprecated
     public void setRotation(float yaw, float pitch);
 
     /**
      * Sets the entity's rotation.
+     * <p>
+     * Note that if the entity is affected by AI, it may override this rotation.
      *
      * @param yaw the yaw
-     * @param relativeYaw whether the yaw is relative to the current yaw
      * @param pitch the pitch
-     * @param relativePitch whether the pitch is relative to the current pitch
      */
-    void setRotation(float yaw, boolean relativeYaw, float pitch, boolean relativePitch);
+    void setRotation(Angle yaw, Angle pitch);
 
     // Paper start - Teleport API
     /**
diff --git a/paper-api/src/main/java/org/bukkit/entity/Player.java b/paper-api/src/main/java/org/bukkit/entity/Player.java
index b219cb329430..159d68c6c41e 100644
--- a/paper-api/src/main/java/org/bukkit/entity/Player.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Player.java
@@ -5,6 +5,7 @@
 import io.papermc.paper.connection.PlayerGameConnection;
 import io.papermc.paper.entity.LookAnchor;
 import io.papermc.paper.entity.PlayerGiveResult;
+import io.papermc.paper.math.Angle;
 import io.papermc.paper.math.Position;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
@@ -3792,24 +3793,24 @@ public int getPing() {
     /**
      * Sets the player's rotation.
      *
+     * @deprecated in favor of {@link #setRotation(Angle, Angle)}
      * @param yaw the yaw
      * @param pitch the pitch
      */
+    @Deprecated
     void setRotation(float yaw, float pitch);
 
     /**
      * Set the player's rotation.
      * <p>
-     * Note: When relative parameters are set, client will do interpolations to
-     * make the rotation smooth, it's different from just send a new rotation with
-     * yaw or pitch addition.
+     * Note: When using relative angles, client will do interpolations to
+     * make the rotation smooth, it's different from just send a new absolute
+     * angle with yaw or pitch addition.
      *
      * @param yaw the yaw
-     * @param relativeYaw whether the yaw is relative to the current yaw
      * @param pitch the pitch
-     * @param relativePitch whether the pitch is relative to the current pitch
      */
-    void setRotation(float yaw, boolean relativeYaw, float pitch, boolean relativePitch);
+    void setRotation(Angle yaw, Angle pitch);
 
     /**
      * Causes the player to look towards the given entity.
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 0de03c97ecb3..555d4f835945 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -14,6 +14,7 @@
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
+import io.papermc.paper.math.Angle;
 import net.kyori.adventure.pointer.PointersSupplier;
 import net.kyori.adventure.util.TriState;
 import net.md_5.bungee.api.chat.BaseComponent;
@@ -276,11 +277,14 @@ public void setRotation(float yaw, float pitch) {
     }
 
     @Override
-    public void setRotation(float yaw, final boolean relativeYaw, float pitch, final boolean relativePitch) {
-        NumberConversions.checkFinite(pitch, "pitch not finite");
-        NumberConversions.checkFinite(yaw, "yaw not finite");
+    public void setRotation(Angle yaw, Angle pitch) {
+        NumberConversions.checkFinite(pitch.degrees(), "pitch not finite");
+        NumberConversions.checkFinite(yaw.degrees(), "yaw not finite");
+
+        float yawValue = yaw.relative() ? yaw.degrees() : Location.normalizeYaw(yaw.degrees());
+        float pitchValue = pitch.relative() ? pitch.degrees() : Location.normalizePitch(pitch.degrees());
 
-        this.getHandle().forceSetRotation(yaw, relativeYaw, pitch, relativePitch);
+        this.getHandle().forceSetRotation(yawValue, yaw.relative(), pitchValue, pitch.relative());
     }
 
     @Override
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
index b57e1fcbcb3d..9897ade66482 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -18,6 +18,7 @@
 import io.papermc.paper.entity.LookAnchor;
 import io.papermc.paper.entity.PaperPlayerGiveResult;
 import io.papermc.paper.entity.PlayerGiveResult;
+import io.papermc.paper.math.Angle;
 import io.papermc.paper.math.Position;
 import io.papermc.paper.util.MCUtil;
 import it.unimi.dsi.fastutil.shorts.ShortArraySet;
@@ -1299,10 +1300,10 @@ public void setRotation(float yaw, float pitch) {
     }
 
     @Override
-    public void setRotation(final float yaw, final boolean relativeYaw, final float pitch, final boolean relativePitch) {
+    public void setRotation(@NonNull Angle yaw, @NonNull Angle pitch) {
         if (this.getHandle().connection == null) return;
 
-        super.setRotation(yaw, relativeYaw, pitch, relativePitch);
+        super.setRotation(yaw, pitch);
     }
 
     @Override

From cd199c456b127962b059e254adf2ba48c9c474a8 Mon Sep 17 00:00:00 2001
From: Clexus <528373858@qq.com>
Date: Sun, 19 Jul 2026 12:29:42 +0800
Subject: [PATCH 06/11] Add @NotNull

---
 paper-api/src/main/java/org/bukkit/entity/Entity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/paper-api/src/main/java/org/bukkit/entity/Entity.java b/paper-api/src/main/java/org/bukkit/entity/Entity.java
index 4cca850f7993..74fc4714997c 100644
--- a/paper-api/src/main/java/org/bukkit/entity/Entity.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Entity.java
@@ -149,7 +149,7 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
      * @param yaw the yaw
      * @param pitch the pitch
      */
-    void setRotation(Angle yaw, Angle pitch);
+    void setRotation(@NotNull Angle yaw, @NotNull Angle pitch);
 
     // Paper start - Teleport API
     /**

From d784931f410647da0182ae07a53786a84661f229 Mon Sep 17 00:00:00 2001
From: Clexus <528373858@qq.com>
Date: Thu, 23 Jul 2026 12:03:23 +0800
Subject: [PATCH 07/11] Correct notes, normalize yaw and pitch

---
 paper-api/src/main/java/org/bukkit/entity/Player.java      | 7 ++++---
 .../java/org/bukkit/craftbukkit/entity/CraftEntity.java    | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/paper-api/src/main/java/org/bukkit/entity/Player.java b/paper-api/src/main/java/org/bukkit/entity/Player.java
index 159d68c6c41e..bd61579203d5 100644
--- a/paper-api/src/main/java/org/bukkit/entity/Player.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Player.java
@@ -3803,9 +3803,10 @@ public int getPing() {
     /**
      * Set the player's rotation.
      * <p>
-     * Note: When using relative angles, client will do interpolations to
-     * make the rotation smooth, it's different from just send a new absolute
-     * angle with yaw or pitch addition.
+     * Note: When using relative angles, client will add corresponding value
+     * to its yaw/pitch client side, avoiding jitter while the player
+     * is actively moving their view, it's different from just send
+     * new absolute angle with only yaw or pitch addition.
      *
      * @param yaw the yaw
      * @param pitch the pitch
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 555d4f835945..94ce5b3837d7 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -281,8 +281,8 @@ public void setRotation(Angle yaw, Angle pitch) {
         NumberConversions.checkFinite(pitch.degrees(), "pitch not finite");
         NumberConversions.checkFinite(yaw.degrees(), "yaw not finite");
 
-        float yawValue = yaw.relative() ? yaw.degrees() : Location.normalizeYaw(yaw.degrees());
-        float pitchValue = pitch.relative() ? pitch.degrees() : Location.normalizePitch(pitch.degrees());
+        float yawValue = Location.normalizeYaw(yaw.degrees());
+        float pitchValue = Location.normalizePitch(pitch.degrees());
 
         this.getHandle().forceSetRotation(yawValue, yaw.relative(), pitchValue, pitch.relative());
     }

From a8fa9bf55371951ee7a2ff1363b7e15e12722aed Mon Sep 17 00:00:00 2001
From: Clexus <62130504+Clexus@users.noreply.github.com>
Date: Sun, 26 Jul 2026 16:16:20 +0800
Subject: [PATCH 08/11] Update
 paper-api/src/main/java/io/papermc/paper/math/Angle.java

Co-authored-by: Warrior <50800980+Warriorrrr@users.noreply.github.com>
---
 paper-api/src/main/java/io/papermc/paper/math/Angle.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/paper-api/src/main/java/io/papermc/paper/math/Angle.java b/paper-api/src/main/java/io/papermc/paper/math/Angle.java
index 5ce3041c93c8..5181f849352c 100644
--- a/paper-api/src/main/java/io/papermc/paper/math/Angle.java
+++ b/paper-api/src/main/java/io/papermc/paper/math/Angle.java
@@ -6,7 +6,7 @@
  * Represents an angle that can be relative or absolute.
  */
 @NullMarked
-public interface Angle {
+public sealed interface Angle permits AngleImpl {
 
     /**
      * Creates a new absolute angle with the specified value. Absolute

From 527ddc2b99727c10ab3d549b078ab0da58d48170 Mon Sep 17 00:00:00 2001
From: Clexus <62130504+Clexus@users.noreply.github.com>
Date: Sun, 26 Jul 2026 16:16:29 +0800
Subject: [PATCH 09/11] Update
 paper-api/src/main/java/io/papermc/paper/math/AngleImpl.java

Co-authored-by: Warrior <50800980+Warriorrrr@users.noreply.github.com>
---
 paper-api/src/main/java/io/papermc/paper/math/AngleImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/paper-api/src/main/java/io/papermc/paper/math/AngleImpl.java b/paper-api/src/main/java/io/papermc/paper/math/AngleImpl.java
index 312f060049bc..8ac617cd43a6 100644
--- a/paper-api/src/main/java/io/papermc/paper/math/AngleImpl.java
+++ b/paper-api/src/main/java/io/papermc/paper/math/AngleImpl.java
@@ -1,4 +1,4 @@
 package io.papermc.paper.math;
 
-public record AngleImpl(float degrees, boolean relative) implements Angle {
+record AngleImpl(float degrees, boolean relative) implements Angle {
 }

From 2b843eef61355d8656e2205bd24cf55318c04bc4 Mon Sep 17 00:00:00 2001
From: Clexus <528373858@qq.com>
Date: Sun, 26 Jul 2026 17:43:35 +0800
Subject: [PATCH 10/11] Obsolete

---
 paper-api/src/main/java/org/bukkit/entity/Entity.java | 2 +-
 paper-api/src/main/java/org/bukkit/entity/Player.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/paper-api/src/main/java/org/bukkit/entity/Entity.java b/paper-api/src/main/java/org/bukkit/entity/Entity.java
index 74fc4714997c..e66170da9b5c 100644
--- a/paper-api/src/main/java/org/bukkit/entity/Entity.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Entity.java
@@ -138,7 +138,7 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
      * @param yaw the yaw
      * @param pitch the pitch
      */
-    @Deprecated
+    @ApiStatus.Obsolete(since = "26.2")
     public void setRotation(float yaw, float pitch);
 
     /**
diff --git a/paper-api/src/main/java/org/bukkit/entity/Player.java b/paper-api/src/main/java/org/bukkit/entity/Player.java
index 31de338244ed..e663f8e0cda1 100644
--- a/paper-api/src/main/java/org/bukkit/entity/Player.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Player.java
@@ -3807,7 +3807,7 @@ public int getPing() {
      * @param yaw the yaw
      * @param pitch the pitch
      */
-    @Deprecated
+    @ApiStatus.Obsolete(since = "26.2")
     void setRotation(float yaw, float pitch);
 
     /**

From 61af193211aadb834913c854aa5fbc4c1e8673ad Mon Sep 17 00:00:00 2001
From: Warrior <50800980+Warriorrrr@users.noreply.github.com>
Date: Sun, 26 Jul 2026 12:05:05 +0200
Subject: [PATCH 11/11] Replace deprecated tag with see

---
 paper-api/src/main/java/org/bukkit/entity/Entity.java | 2 +-
 paper-api/src/main/java/org/bukkit/entity/Player.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/paper-api/src/main/java/org/bukkit/entity/Entity.java b/paper-api/src/main/java/org/bukkit/entity/Entity.java
index e66170da9b5c..517177ca7745 100644
--- a/paper-api/src/main/java/org/bukkit/entity/Entity.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Entity.java
@@ -134,9 +134,9 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
      * <p>
      * Note that if the entity is affected by AI, it may override this rotation.
      *
-     * @deprecated in favor of {@link #setRotation(Angle, Angle)}
      * @param yaw the yaw
      * @param pitch the pitch
+     * @see #setRotation(Angle, Angle)
      */
     @ApiStatus.Obsolete(since = "26.2")
     public void setRotation(float yaw, float pitch);
diff --git a/paper-api/src/main/java/org/bukkit/entity/Player.java b/paper-api/src/main/java/org/bukkit/entity/Player.java
index e663f8e0cda1..5f65afdbc48f 100644
--- a/paper-api/src/main/java/org/bukkit/entity/Player.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Player.java
@@ -3803,9 +3803,9 @@ public int getPing() {
     /**
      * Sets the player's rotation.
      *
-     * @deprecated in favor of {@link #setRotation(Angle, Angle)}
      * @param yaw the yaw
      * @param pitch the pitch
+     * @see #setRotation(Angle, Angle)
      */
     @ApiStatus.Obsolete(since = "26.2")
     void setRotation(float yaw, float pitch);