diff --git a/patches/server/0041-Prevent-velocity-freeze.patch b/patches/server/0041-Prevent-velocity-freeze.patch new file mode 100644 index 0000000..4b2c17c --- /dev/null +++ b/patches/server/0041-Prevent-velocity-freeze.patch @@ -0,0 +1,86 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Allink +Date: Sun, 27 Nov 2022 05:14:18 +0000 +Subject: [PATCH] Prevent velocity freeze + + +diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java +index a603d99430aedb3c242c2833e0cc8a31aba49205..2be290fac27b0a8dea163f4337fcd19c0ee87168 100644 +--- a/src/main/java/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java ++++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java +@@ -41,9 +41,13 @@ public abstract class AbstractHurtingProjectile extends Projectile { + double d6 = Math.sqrt(d3 * d3 + d4 * d4 + d5 * d5); + + if (d6 != 0.0D) { +- this.xPower = d3 / d6 * 0.1D; +- this.yPower = d4 / d6 * 0.1D; +- this.zPower = d5 / d6 * 0.1D; ++ // Scissors start - Prevent projectile velocity freeze ++ //this.xPower = d3 / d6 * 0.1D; ++ //this.yPower = d4 / d6 * 0.1D; ++ //this.zPower = d5 / d6 * 0.1D; ++ // Scissors end ++ ++ setPower(d3 / d6 * .1d, d4 / d6 * .1d, d5 / d6 * .1d); + } + + } +@@ -150,6 +154,25 @@ public abstract class AbstractHurtingProjectile extends Projectile { + nbt.put("power", this.newDoubleList(new double[]{this.xPower, this.yPower, this.zPower})); + } + ++ // Scissors start - Prevent projectile velocity freeze ++ public void setPower(double xPower, double yPower, double zPower) ++ { ++ if (Double.isInfinite(xPower) || Double.isInfinite(yPower) || Double.isInfinite(zPower)) ++ { ++ return; ++ } ++ ++ if (Double.isNaN(xPower) || Double.isNaN(yPower) || Double.isNaN(zPower)) ++ { ++ return; ++ } ++ ++ this.xPower = xPower; ++ this.yPower = yPower; ++ this.zPower = zPower; ++ } ++ // Scissors end ++ + @Override + public void readAdditionalSaveData(CompoundTag nbt) { + super.readAdditionalSaveData(nbt); +@@ -157,9 +180,13 @@ public abstract class AbstractHurtingProjectile extends Projectile { + ListTag nbttaglist = nbt.getList("power", 6); + + if (nbttaglist.size() == 3) { +- this.xPower = nbttaglist.getDouble(0); +- this.yPower = nbttaglist.getDouble(1); +- this.zPower = nbttaglist.getDouble(2); ++ // Scissors start - Prevent projectile velocity freeze ++ //this.xPower = nbttaglist.getDouble(0); ++ //this.yPower = nbttaglist.getDouble(1); ++ //this.zPower = nbttaglist.getDouble(2); ++ // Scissors end ++ ++ setPower(nbttaglist.getDouble(0), nbttaglist.getDouble(1), nbttaglist.getDouble(2)); + } + } + +@@ -193,9 +220,12 @@ public abstract class AbstractHurtingProjectile extends Projectile { + Vec3 vec3d = entity.getLookAngle(); + + this.setDeltaMovement(vec3d); +- this.xPower = vec3d.x * 0.1D; +- this.yPower = vec3d.y * 0.1D; +- this.zPower = vec3d.z * 0.1D; ++ // Scissors start - Prevent projectile velocity freeze ++ //this.xPower = vec3d.x * 0.1D; ++ //this.yPower = vec3d.y * 0.1D; ++ //this.zPower = vec3d.z * 0.1D; ++ setPower(vec3d.x * 0.1D, vec3d.y * 0.1D, vec3d.z * 0.1D); ++ // Scissors end + this.setOwner(entity); + } +