aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0739-Stop-large-look-changes-from-crashing-the-server.patch
diff options
context:
space:
mode:
authorNassim Jahnke <[email protected]>2024-06-16 12:56:00 +0200
committerNassim Jahnke <[email protected]>2024-06-16 12:56:00 +0200
commitdc684c60d16f66ea84467ec8e253f2a36a17a7c8 (patch)
treee516f1bd4bfbdb37a5aeee42384aade111eca3e1 /patches/server/0739-Stop-large-look-changes-from-crashing-the-server.patch
parent752f957e12e4ceb8b7d2043a4a7dbce786b7b98f (diff)
downloadPaper-dc684c60d16f66ea84467ec8e253f2a36a17a7c8.tar.gz
Paper-dc684c60d16f66ea84467ec8e253f2a36a17a7c8.zip
Remove bad server.scheduleOnMain disconnect calls from old patches
The new behavior of disconnect to block the current thread until the disconnect succeeded is better than throwing it off to happen at some point
Diffstat (limited to 'patches/server/0739-Stop-large-look-changes-from-crashing-the-server.patch')
-rw-r--r--patches/server/0739-Stop-large-look-changes-from-crashing-the-server.patch74
1 files changed, 74 insertions, 0 deletions
diff --git a/patches/server/0739-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0739-Stop-large-look-changes-from-crashing-the-server.patch
new file mode 100644
index 0000000000..63adf0fc72
--- /dev/null
+++ b/patches/server/0739-Stop-large-look-changes-from-crashing-the-server.patch
@@ -0,0 +1,74 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MWHunter <[email protected]>
+Date: Wed, 24 Aug 2022 09:54:11 -0400
+Subject: [PATCH] Stop large look changes from crashing the server
+
+Co-authored-by: Jaren Knodel <[email protected]>
+
+diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+index 8e11b085d2159b1df8bbe536beb66d9bed915373..1d6179d54ff2264d3489770b23fc7ba479c17f25 100644
+--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
++++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+@@ -3129,37 +3129,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
+ this.level().getProfiler().pop();
+ this.level().getProfiler().push("rangeChecks");
+
+- while (this.getYRot() - this.yRotO < -180.0F) {
+- this.yRotO -= 360.0F;
+- }
+-
+- while (this.getYRot() - this.yRotO >= 180.0F) {
+- this.yRotO += 360.0F;
+- }
++ // Paper start - stop large pitch and yaw changes from crashing the server
++ this.yRotO += Math.round((this.getYRot() - this.yRotO) / 360.0F) * 360.0F;
+
+- while (this.yBodyRot - this.yBodyRotO < -180.0F) {
+- this.yBodyRotO -= 360.0F;
+- }
++ this.yBodyRotO += Math.round((this.yBodyRot - this.yBodyRotO) / 360.0F) * 360.0F;
+
+- while (this.yBodyRot - this.yBodyRotO >= 180.0F) {
+- this.yBodyRotO += 360.0F;
+- }
+-
+- while (this.getXRot() - this.xRotO < -180.0F) {
+- this.xRotO -= 360.0F;
+- }
++ this.xRotO += Math.round((this.getXRot() - this.xRotO) / 360.0F) * 360.0F;
+
+- while (this.getXRot() - this.xRotO >= 180.0F) {
+- this.xRotO += 360.0F;
+- }
+-
+- while (this.yHeadRot - this.yHeadRotO < -180.0F) {
+- this.yHeadRotO -= 360.0F;
+- }
+-
+- while (this.yHeadRot - this.yHeadRotO >= 180.0F) {
+- this.yHeadRotO += 360.0F;
+- }
++ this.yHeadRotO += Math.round((this.yHeadRot - this.yHeadRotO) / 360.0F) * 360.0F;
++ // Paper end
+
+ this.level().getProfiler().pop();
+ this.animStep += f2;
+diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
+index ff6007bbf8361db7967b6bf621b27a1d23102e77..d147f3cc1af28c384005c1c20e37bb588588c88d 100644
+--- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
++++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
+@@ -310,13 +310,7 @@ public abstract class Projectile extends Entity implements TraceableEntity {
+ }
+
+ protected static float lerpRotation(float prevRot, float newRot) {
+- while (newRot - prevRot < -180.0F) {
+- prevRot -= 360.0F;
+- }
+-
+- while (newRot - prevRot >= 180.0F) {
+- prevRot += 360.0F;
+- }
++ prevRot += Math.round((newRot - prevRot) / 360.0F) * 360.0F; // Paper - stop large look changes from crashing the server
+
+ return Mth.lerp(0.2F, prevRot, newRot);
+ }