diff --git a/sources/src/main/java/io/akarin/server/mixin/optimization/MixinEntity.java b/sources/src/main/java/io/akarin/server/mixin/optimization/MixinEntity.java
index bc440a694..2a4a0e1b2 100644
--- a/sources/src/main/java/io/akarin/server/mixin/optimization/MixinEntity.java
+++ b/sources/src/main/java/io/akarin/server/mixin/optimization/MixinEntity.java
@@ -7,6 +7,7 @@ import org.spongepowered.asm.mixin.Shadow;
 import net.minecraft.server.AxisAlignedBB;
 import net.minecraft.server.Entity;
 import net.minecraft.server.Material;
+import net.minecraft.server.MathHelper;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.World;
 
@@ -15,6 +16,14 @@ public abstract class MixinEntity {
     @Shadow public World world;
     @Shadow public abstract AxisAlignedBB getBoundingBox();
     
+    @Shadow public boolean noclip;
+    @Shadow public float R;
+    @Shadow public double locX;
+    @Shadow public double locZ;
+    @Shadow public abstract boolean x(Entity entity);
+    @Shadow public abstract boolean isVehicle();
+    @Shadow public abstract void f(double d0, double d1, double d2);
+    
     private boolean isInLava;
     private int lastLavaCheck = Integer.MIN_VALUE;
     
@@ -31,4 +40,36 @@ public abstract class MixinEntity {
         }
         return this.isInLava;
     }
+    @Overwrite 
+    public void collide(Entity entity) {
+		if (entity.noclip || this.noclip || this.x(entity)) return; // NeonPaper - Test this earlier
+        double d0 = entity.locX - this.locX;
+        double d1 = entity.locZ - this.locZ;
+        double d2 = MathHelper.a(d0, d1);
+
+        if (d2 >= 0.009999999776482582D) {
+            d2 = (double) MathHelper.sqrt(d2);
+            d0 /= d2;
+            d1 /= d2;
+            double d3 = 1.0D / d2;
+
+            if (d3 > 1.0D) {
+                d3 = 1.0D;
+            }
+
+            d0 *= d3;
+            d1 *= d3;
+            d0 *= 0.05000000074505806D;
+            d1 *= 0.05000000074505806D;
+            d0 *= (double) (1.0F - this.R);
+            d1 *= (double) (1.0F - this.R);
+            if (!this.isVehicle()) {
+                this.f(-d0, 0.0D, -d1);
+            }
+
+            if (!entity.isVehicle()) {
+                entity.f(d0, 0.0D, d1);
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/sources/src/main/java/net/minecraft/server/Entity.java b/sources/src/main/java/net/minecraft/server/Entity.java
index 702a25ca5..5591fc33d 100644
--- a/sources/src/main/java/net/minecraft/server/Entity.java
+++ b/sources/src/main/java/net/minecraft/server/Entity.java
@@ -1387,33 +1387,37 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper
     public void d(EntityHuman entityhuman) {}
 
     public void collide(Entity entity) {
-		if (entity.noclip || this.noclip || this.x(entity)) return; // NeonPaper - Test this earlier
-        double d0 = entity.locX - this.locX;
-        double d1 = entity.locZ - this.locZ;
-        double d2 = MathHelper.a(d0, d1);
+        if (!this.x(entity)) {
+            if (!entity.noclip && !this.noclip) {
+                double d0 = entity.locX - this.locX;
+                double d1 = entity.locZ - this.locZ;
+                double d2 = MathHelper.a(d0, d1);
 
-        if (d2 >= 0.009999999776482582D) {
-            d2 = (double) MathHelper.sqrt(d2);
-            d0 /= d2;
-            d1 /= d2;
-            double d3 = 1.0D / d2;
+                if (d2 >= 0.009999999776482582D) {
+                    d2 = (double) MathHelper.sqrt(d2);
+                    d0 /= d2;
+                    d1 /= d2;
+                    double d3 = 1.0D / d2;
 
-            if (d3 > 1.0D) {
-                d3 = 1.0D;
-            }
+                    if (d3 > 1.0D) {
+                        d3 = 1.0D;
+                    }
 
-            d0 *= d3;
-            d1 *= d3;
-            d0 *= 0.05000000074505806D;
-            d1 *= 0.05000000074505806D;
-            d0 *= (double) (1.0F - this.R);
-            d1 *= (double) (1.0F - this.R);
-            if (!this.isVehicle()) {
-                this.f(-d0, 0.0D, -d1);
-            }
+                    d0 *= d3;
+                    d1 *= d3;
+                    d0 *= 0.05000000074505806D;
+                    d1 *= 0.05000000074505806D;
+                    d0 *= (double) (1.0F - this.R);
+                    d1 *= (double) (1.0F - this.R);
+                    if (!this.isVehicle()) {
+                        this.f(-d0, 0.0D, -d1);
+                    }
+
+                    if (!entity.isVehicle()) {
+                        entity.f(d0, 0.0D, d1);
+                    }
+                }
 
-            if (!entity.isVehicle()) {
-                entity.f(d0, 0.0D, d1);
             }
         }
     }
diff --git a/sources/src/main/java/net/minecraft/server/MathHelper.java b/sources/src/main/java/net/minecraft/server/MathHelper.java
deleted file mode 100644
index 97dd428ee..000000000
--- a/sources/src/main/java/net/minecraft/server/MathHelper.java
+++ /dev/null
@@ -1,370 +0,0 @@
-package net.minecraft.server;
-
-import java.util.Random;
-import java.util.UUID;
-
-public class MathHelper {
-	
-    public static final float a = c(2.0F);
-    private static final int[] SINE_TABLE_INT = new int[16384 + 1];
-    private static final float SINE_TABLE_MIDPOINT;
-    private static final Random c = new Random();
-    private static final int[] d;
-    private static final double e;
-    private static final double[] f;
-    private static final double[] g;
-	
-    public static float sin(float f) {
-        return lookup((int) (f * 10430.38) & 0xFFFF);
-    }
-	
-    public static float cos(float f) {
-        return lookup((int) (f * 10430.38 + 16384.0) & 0xFFFF);
-    }
-	
-	private static float lookup(int index) {
-        if (index == 32768) {
-            return SINE_TABLE_MIDPOINT;
-        }
-        int neg = (index & 0x8000) << 16;
-        int mask = (index << 17) >> 31;
-        int pos = (0x8001 & mask) + (index ^ mask);
-        pos &= 0x7fff;
-        return Float.intBitsToFloat(SINE_TABLE_INT[pos] ^ neg);
-    }
-
-    public static float c(float f) {
-        return (float) Math.sqrt((double) f);
-    }
-
-    public static float sqrt(double d0) {
-        return (float) Math.sqrt(d0);
-    }
-
-    public static int d(float f) {
-        int i = (int) f;
-
-        return f < (float) i ? i - 1 : i;
-    }
-
-    public static int floor(double d0) {
-        int i = (int) d0;
-
-        return d0 < (double) i ? i - 1 : i;
-    }
-
-    public static long d(double d0) {
-        long i = (long) d0;
-
-        return d0 < (double) i ? i - 1L : i;
-    }
-
-    public static float e(float f) {
-        return f >= 0.0F ? f : -f;
-    }
-
-    public static int a(int i) {
-        return i >= 0 ? i : -i;
-    }
-
-    public static int f(float f) {
-        int i = (int) f;
-
-        return f > (float) i ? i + 1 : i;
-    }
-
-    public static int f(double d0) {
-        int i = (int) d0;
-
-        return d0 > (double) i ? i + 1 : i;
-    }
-
-    public static int clamp(int i, int j, int k) {
-        return i < j ? j : (i > k ? k : i);
-    }
-
-    public static float a(float f, float f1, float f2) {
-        return f < f1 ? f1 : (f > f2 ? f2 : f);
-    }
-
-    public static double a(double d0, double d1, double d2) {
-        return d0 < d1 ? d1 : (d0 > d2 ? d2 : d0);
-    }
-
-    public static double b(double d0, double d1, double d2) {
-        return d2 < 0.0D ? d0 : (d2 > 1.0D ? d1 : d0 + (d1 - d0) * d2);
-    }
-
-    public static double a(double d0, double d1) {
-        if (d0 < 0.0D) {
-            d0 = -d0;
-        }
-
-        if (d1 < 0.0D) {
-            d1 = -d1;
-        }
-
-        return d0 > d1 ? d0 : d1;
-    }
-
-    public static int nextInt(Random random, int i, int j) {
-        return i >= j ? i : random.nextInt(j - i + 1) + i;
-    }
-
-    public static float a(Random random, float f, float f1) {
-        return f >= f1 ? f : random.nextFloat() * (f1 - f) + f;
-    }
-
-    public static double a(Random random, double d0, double d1) {
-        return d0 >= d1 ? d0 : random.nextDouble() * (d1 - d0) + d0;
-    }
-
-    public static double a(long[] along) {
-        long i = 0L;
-        long[] along1 = along;
-        int j = along.length;
-
-        for (int k = 0; k < j; ++k) {
-            long l = along1[k];
-
-            i += l;
-        }
-
-        return (double) i / (double) along.length;
-    }
-
-    public static float g(float f) {
-        f %= 360.0F;
-        if (f >= 180.0F) {
-            f -= 360.0F;
-        }
-
-        if (f < -180.0F) {
-            f += 360.0F;
-        }
-
-        return f;
-    }
-
-    public static double g(double d0) {
-        d0 %= 360.0D;
-        if (d0 >= 180.0D) {
-            d0 -= 360.0D;
-        }
-
-        if (d0 < -180.0D) {
-            d0 += 360.0D;
-        }
-
-        return d0;
-    }
-
-    public static int b(int i) {
-        i %= 360;
-        if (i >= 180) {
-            i -= 360;
-        }
-
-        if (i < -180) {
-            i += 360;
-        }
-
-        return i;
-    }
-
-    public static int a(String s, int i) {
-        try {
-            return Integer.parseInt(s);
-        } catch (Throwable throwable) {
-            return i;
-        }
-    }
-
-    public static int a(String s, int i, int j) {
-        return Math.max(j, a(s, i));
-    }
-
-    public static double a(String s, double d0) {
-        try {
-            return Double.parseDouble(s);
-        } catch (Throwable throwable) {
-            return d0;
-        }
-    }
-
-    public static double a(String s, double d0, double d1) {
-        return Math.max(d1, a(s, d0));
-    }
-
-    public static int c(int i) {
-        int j = i - 1;
-
-        j |= j >> 1;
-        j |= j >> 2;
-        j |= j >> 4;
-        j |= j >> 8;
-        j |= j >> 16;
-        return j + 1;
-    }
-
-    private static boolean g(int i) {
-        return i != 0 && (i & i - 1) == 0;
-    }
-
-    public static int d(int i) {
-        i = g(i) ? i : c(i);
-        return MathHelper.d[(int) ((long) i * 125613361L >> 27) & 31];
-    }
-
-    public static int e(int i) {
-        return d(i) - (g(i) ? 0 : 1);
-    }
-
-    public static int c(int i, int j) {
-        if (j == 0) {
-            return 0;
-        } else if (i == 0) {
-            return j;
-        } else {
-            if (i < 0) {
-                j *= -1;
-            }
-
-            int k = i % j;
-
-            return k == 0 ? i : i + j - k;
-        }
-    }
-
-    public static long c(int i, int j, int k) {
-        long l = (long) (i * 3129871) ^ (long) k * 116129781L ^ (long) j;
-
-        l = l * l * 42317861L + l * 11L;
-        return l;
-    }
-
-    public static UUID a(Random random) {
-        long i = random.nextLong() & -61441L | 16384L;
-        long j = random.nextLong() & 4611686018427387903L | Long.MIN_VALUE;
-
-        return new UUID(i, j);
-    }
-
-    public static UUID a() {
-        return a(MathHelper.c);
-    }
-
-    public static double c(double d0, double d1, double d2) {
-        return (d0 - d1) / (d2 - d1);
-    }
-
-    public static double c(double d0, double d1) {
-        double d2 = d1 * d1 + d0 * d0;
-
-        if (Double.isNaN(d2)) {
-            return Double.NaN;
-        } else {
-            boolean flag = d0 < 0.0D;
-
-            if (flag) {
-                d0 = -d0;
-            }
-
-            boolean flag1 = d1 < 0.0D;
-
-            if (flag1) {
-                d1 = -d1;
-            }
-
-            boolean flag2 = d0 > d1;
-            double d3;
-
-            if (flag2) {
-                d3 = d1;
-                d1 = d0;
-                d0 = d3;
-            }
-
-            d3 = i(d2);
-            d1 *= d3;
-            d0 *= d3;
-            double d4 = MathHelper.e + d0;
-            int i = (int) Double.doubleToRawLongBits(d4);
-            double d5 = MathHelper.f[i];
-            double d6 = MathHelper.g[i];
-            double d7 = d4 - MathHelper.e;
-            double d8 = d0 * d6 - d1 * d7;
-            double d9 = (6.0D + d8 * d8) * d8 * 0.16666666666666666D;
-            double d10 = d5 + d9;
-
-            if (flag2) {
-                d10 = 1.5707963267948966D - d10;
-            }
-
-            if (flag1) {
-                d10 = 3.141592653589793D - d10;
-            }
-
-            if (flag) {
-                d10 = -d10;
-            }
-
-            return d10;
-        }
-    }
-
-    public static double i(double d0) {
-        double d1 = 0.5D * d0;
-        long i = Double.doubleToRawLongBits(d0);
-
-        i = 6910469410427058090L - (i >> 1);
-        d0 = Double.longBitsToDouble(i);
-        d0 *= 1.5D - d1 * d0 * d0;
-        return d0;
-    }
-
-    public static int f(int i) {
-        i ^= i >>> 16;
-        i *= -2048144789;
-        i ^= i >>> 13;
-        i *= -1028477387;
-        i ^= i >>> 16;
-        return i;
-    }
-
-    static {
-        int i;
-		
-		final float[] SINE_TABLE = new float[65536];
-		for (i = 0; i < 65536; ++i) {
-            SINE_TABLE[i] = (float) Math.sin((double) i * 3.141592653589793D * 2.0D / 65536.0D);
-        }
-        for (i = 0; i < SINE_TABLE_INT.length; i++) {
-            SINE_TABLE_INT[i] = Float.floatToRawIntBits(SINE_TABLE[i]);
-        }
-
-        SINE_TABLE_MIDPOINT = SINE_TABLE[SINE_TABLE.length / 2];
-        for (i = 0; i < SINE_TABLE.length; i++) {
-            float expected = SINE_TABLE[i];
-            float value = lookup(i);
-
-            if (expected != value) {
-                throw new IllegalArgumentException(String.format("LUT error at index %d (expected: %s, found: %s)", i, expected, value));
-            }
-        }
-
-        d = new int[] { 0, 1, 28, 2, 29, 14, 24, 3, 30, 22, 20, 15, 25, 17, 4, 8, 31, 27, 13, 23, 21, 19, 16, 7, 26, 12, 18, 6, 11, 5, 10, 9};
-        e = Double.longBitsToDouble(4805340802404319232L);
-        f = new double[257];
-        g = new double[257];
-
-        for (i = 0; i < 257; ++i) {
-            double d0 = (double) i / 256.0D;
-            double d1 = Math.asin(d0);
-
-            MathHelper.g[i] = Math.cos(d1);
-            MathHelper.f[i] = d1;
-        }
-
-    }
-}