From 6caaa619a1cadfc4ee77ab0948f7e9a9f4baf7b6 Mon Sep 17 00:00:00 2001 From: Warrior <50800980+Warriorrrr@users.noreply.github.com> Date: Mon, 17 Feb 2025 15:58:58 +0100 Subject: [PATCH 1/3] Fix getForwards/SidewaysMovement for players --- .../java/org/bukkit/entity/LivingEntity.java | 6 +++-- .../craftbukkit/entity/CraftPlayer.java | 22 +++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/paper-api/src/main/java/org/bukkit/entity/LivingEntity.java b/paper-api/src/main/java/org/bukkit/entity/LivingEntity.java index d21a228bbec0..5135a4a51341 100644 --- a/paper-api/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/paper-api/src/main/java/org/bukkit/entity/LivingEntity.java @@ -1118,7 +1118,8 @@ default void setArrowsInBody(final int count) { * - Positive 1 represents movement to the left. * - Negative 1 represents movement to the right. *
- * Please note that for entities of type {@link Player}, this value is updated only when riding another entity. + * Please note that for entities of type {@link Player}, this value will only return whole numbers depending + * on what keys are held, see {@link Player#getCurrentInput()}. *
* This method specifically provides information about the entity's sideways movement, whereas {@link #getVelocity()} returns * a vector representing the entity's overall current momentum. @@ -1151,7 +1152,8 @@ default void setArrowsInBody(final int count) { * - Positive 1 represents movement forwards. * - Negative 1 represents movement backwards. *
- * Please note that for entities of type {@link Player}, this value is updated only when riding another entity. + * Please note that for entities of type {@link Player}, this value will only return whole numbers depending + * on what keys are held, see {@link Player#getCurrentInput()}. *
* This method specifically provides information about the entity's forward and backward movement, * whereas {@link #getVelocity()} returns a vector representing the entity's overall current momentum. 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 3260f20b6679..24d838be3ba3 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 @@ -3583,4 +3583,26 @@ public void sendEntityEffect(final EntityEffect effect, final org.bukkit.entity. handle.containerMenu.broadcastChanges(); return new PaperPlayerGiveResult(leftovers.build(), drops.build()); } + + @Override + public float getSidewaysMovement() { + final boolean leftMovement = this.getHandle().getLastClientInput().left(); + final boolean rightMovement = this.getHandle().getLastClientInput().right(); + + if (leftMovement == rightMovement) + return 0; + + return leftMovement ? 1 : -1; + } + + @Override + public float getForwardsMovement() { + final boolean forwardMovement = this.getHandle().getLastClientInput().forward(); + final boolean backwardMovement = this.getHandle().getLastClientInput().backward(); + + if (forwardMovement == backwardMovement) + return 0; + + return forwardMovement ? 1 : -1; + } } From 7b0dc02e9e2951e608458056cf5e22d8c7231fae Mon Sep 17 00:00:00 2001 From: Warrior <50800980+Warriorrrr@users.noreply.github.com> Date: Mon, 17 Feb 2025 18:43:56 +0100 Subject: [PATCH 2/3] Fix war crime --- .../org/bukkit/craftbukkit/entity/CraftPlayer.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) 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 24d838be3ba3..218a27def751 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 @@ -3589,10 +3589,7 @@ public float getSidewaysMovement() { final boolean leftMovement = this.getHandle().getLastClientInput().left(); final boolean rightMovement = this.getHandle().getLastClientInput().right(); - if (leftMovement == rightMovement) - return 0; - - return leftMovement ? 1 : -1; + return leftMovement == rightMovement ? 0 : leftMovement ? 1 : -1; } @Override @@ -3600,9 +3597,6 @@ public float getForwardsMovement() { final boolean forwardMovement = this.getHandle().getLastClientInput().forward(); final boolean backwardMovement = this.getHandle().getLastClientInput().backward(); - if (forwardMovement == backwardMovement) - return 0; - - return forwardMovement ? 1 : -1; + return forwardMovement == backwardMovement ? 0 : forwardMovement ? 1 : -1; } } From 767cbc5cabc377dbf67a04bfaf1e7e7b6b935a27 Mon Sep 17 00:00:00 2001 From: Warrior <50800980+Warriorrrr@users.noreply.github.com> Date: Mon, 17 Feb 2025 23:42:31 +0100 Subject: [PATCH 3/3] Make proper lists in javaodcs --- .../java/org/bukkit/entity/LivingEntity.java | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/paper-api/src/main/java/org/bukkit/entity/LivingEntity.java b/paper-api/src/main/java/org/bukkit/entity/LivingEntity.java index 5135a4a51341..5c1a368194d9 100644 --- a/paper-api/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/paper-api/src/main/java/org/bukkit/entity/LivingEntity.java @@ -1115,9 +1115,11 @@ default void setArrowsInBody(final int count) { * Retrieves the sideways movement direction of the entity. *
* The returned value ranges from -1 to 1, where: - * - Positive 1 represents movement to the left. - * - Negative 1 represents movement to the right. - *
+ *
@@ -1132,9 +1134,11 @@ default void setArrowsInBody(final int count) { * Retrieves the upwards movement direction of the entity. *
* The returned value ranges from -1 to 1, where: - * - Positive 1 represents upward movement. - * - Negative 1 represents downward movement. - *
+ *
* This method specifically provides information about the entity's vertical movement, @@ -1149,9 +1153,11 @@ default void setArrowsInBody(final int count) { * Retrieves the forwards movement direction of the entity. *
* The returned value ranges from -1 to 1, where: - * - Positive 1 represents movement forwards. - * - Negative 1 represents movement backwards. - *
+ *