mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-29 19:52:55 +01:00
3e90a19183
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 304e83eb PR-1002: Improve documentation and implementation of getMaxStackSize e8215ea2 SPIGOT-7638: Library loader does not seem to resolve every dependency 79c595c0 SPIGOT-7637: Bad logic in checking nullability of AttributeModifier slots CraftBukkit Changes: 91b1fc3f1 SPIGOT-7644: Fix ItemMeta#getAsString 4e77a81e1 SPIGOT-7615: PlayerLeashEntityEvent cancelled eats lead 996f660f3 Do not remove leash knot if leasing to an existing leash knot gets cancelled f70367d42 SPIGOT-7643: Fix inverted leash event cancelled usage and remove leash knot if no entity gets leashed 7ddb48294 SPIGOT-7640: Abnormal jumping height of wind charge 080c8711e SPIGOT-7639: Incoming plugin channels not working ad549847e Open a direct connection instead of pinging mojang server to check if it is reachable 38e2926c5 SPIGOT-7365: DamageCause blocked by shield should trigger invulnerableTime
74 lines
3.1 KiB
Diff
74 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 44ce7ffd8304f0f295f632211931f5b9f6c72d17..33506e82025656df4a13aeacb788d73e5e5a4929 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
@@ -3142,37 +3142,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 ccb7aa341e3087255bce1f6fb953d33584147fd3..4c6fbf19d6bb01e67c6141aea757fae434ee8233 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
|
|
@@ -298,13 +298,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);
|
|
}
|