From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Allink <arclicious@vivaldi.net>
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 2096e8a0bdbcfc865f175f3a01ab688542481531..2ad58d4e4fd361d17803f57c3496a92bd233c857 100644
--- a/src/main/java/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java
+++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java
@@ -1,5 +1,6 @@
 package net.minecraft.world.entity.projectile;
 
+import me.totalfreedom.scissors.MathUtility; // Scissors
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.nbt.CompoundTag;
@@ -41,9 +42,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;
+
+            setPower(d3 / d6 * .1d, d4 / d6 * .1d, d5 / d6 * .1d);
+            // Scissors end
         }
 
     }
@@ -141,6 +146,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 = MathUtility.clampDouble(xPower, -1024, 1024);
+        this.yPower = MathUtility.clampDouble(yPower, -1024, 1024);
+        this.zPower = MathUtility.clampDouble(zPower, -1024, 1024);
+    }
+    // Scissors end
+
     @Override
     public void readAdditionalSaveData(CompoundTag nbt) {
         super.readAdditionalSaveData(nbt);
@@ -148,9 +172,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);
+
+                setPower(nbttaglist.getDouble(0), nbttaglist.getDouble(1), nbttaglist.getDouble(2));
+                // Scissors end
             }
         }
 
@@ -184,9 +212,13 @@ 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);
                 }