75 lines
3.1 KiB
Diff
75 lines
3.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: MWHunter <s0521458@student.rockvalleycollege.edu>
|
|
Date: Wed, 24 Aug 2022 09:54:11 -0400
|
|
Subject: [PATCH] Stop large look changes from crashing the server
|
|
|
|
Co-authored-by: Jaren Knodel <Jaren@Knodel.com>
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
index 33c22f908440664dc9d67f1678a3c4bd8b862457..1c8661afcfaaf56953cef3a5c26fbc4fa3ac5b1c 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
@@ -3008,37 +3008,15 @@ public abstract class LivingEntity extends Entity {
|
|
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 66c3f374a779cd3a4548393ba23e9219f1caf6d3..c61ed38d0a824fee9b45acfc862baf03c85fe54b 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
|
|
@@ -245,13 +245,7 @@ public abstract class Projectile extends Entity {
|
|
}
|
|
|
|
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);
|
|
}
|