mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-19 15:09:25 +00:00
ccf2f9c0d2
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@a9399451 Fixup sendAllDataToRemote calls PaperMC/Paper@cb47e018 Remove more dead code, fix pre-existing desync when cancelling and closing container PaperMC/Paper@40764534 Specify the class loader when loading services (#12829) PaperMC/Paper@1bf6364b Update Mache for horse decompile fix PaperMC/Paper@76fb5060 Add vanilla error message to precondition for DialogBaseImpl (#12831) Purpur Changes: PurpurMC/Purpur@5b26bab8 Updated Upstream (Paper) PurpurMC/Purpur@8734844b sigh... PurpurMC/Purpur@09ea9cb9 fix mobs not burning in daylight (#1689) PurpurMC/Purpur@4d5a8e6e Updated Upstream (Paper) PurpurMC/Purpur@7dbe4153 Add support for "/chase", a disabled Minecraft command. (#1690) PurpurMC/Purpur@11c030a8 Updated Upstream (Paper)
81 lines
3.4 KiB
Diff
81 lines
3.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: HaHaWTH <102713261+HaHaWTH@users.noreply.github.com>
|
|
Date: Fri, 29 Oct 2077 00:00:00 +0800
|
|
Subject: [PATCH] Optimize Entity distanceToSqr
|
|
|
|
This patch optimizes Entity#distanceToSqr call by using Math#fma which is around 1.2x to 4x faster than original method,
|
|
avoids multiple casting in Entity#distanceTo, using Math#sqrt directly instead of Mojang's Mth#sqrt. Additionally, this patch makes
|
|
these methods more able to be inlined by the JIT compiler.
|
|
|
|
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
|
|
index 2bed05da7e5ba52e85d437460679a7b81293fe5b..fde4109b27fbafd9db1eaeedf7a6cd754a84024d 100644
|
|
--- a/net/minecraft/world/entity/Entity.java
|
|
+++ b/net/minecraft/world/entity/Entity.java
|
|
@@ -2260,31 +2260,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
|
return new Vec3(this.xOld, this.yOld, this.zOld);
|
|
}
|
|
|
|
- public float distanceTo(Entity entity) {
|
|
- float f = (float)(this.getX() - entity.getX());
|
|
- float f1 = (float)(this.getY() - entity.getY());
|
|
- float f2 = (float)(this.getZ() - entity.getZ());
|
|
- return Mth.sqrt(f * f + f1 * f1 + f2 * f2);
|
|
- }
|
|
-
|
|
- public double distanceToSqr(double x, double y, double z) {
|
|
- double d = this.getX() - x;
|
|
- double d1 = this.getY() - y;
|
|
- double d2 = this.getZ() - z;
|
|
- return d * d + d1 * d1 + d2 * d2;
|
|
- }
|
|
-
|
|
- public double distanceToSqr(Entity entity) {
|
|
- return this.distanceToSqr(entity.position());
|
|
- }
|
|
-
|
|
- public double distanceToSqr(Vec3 vec) {
|
|
- double d = this.getX() - vec.x;
|
|
- double d1 = this.getY() - vec.y;
|
|
- double d2 = this.getZ() - vec.z;
|
|
- return d * d + d1 * d1 + d2 * d2;
|
|
- }
|
|
-
|
|
public void playerTouch(Player player) {
|
|
}
|
|
|
|
@@ -5509,4 +5484,34 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
|
return false;
|
|
}
|
|
// Purpur end - Ridables
|
|
+
|
|
+ // Leaf start - Optimize Entity distanceTo
|
|
+ // Inlining and avoid casting
|
|
+ // Use Math#sqrt instead of Mojang's Mth#sqrt - only cast once
|
|
+ // Added option to enable FMA acceleration
|
|
+ public final float distanceTo(Entity entity) {
|
|
+ final double dx = this.getX() - entity.getX();
|
|
+ final double dy = this.getY() - entity.getY();
|
|
+ final double dz = this.getZ() - entity.getZ();
|
|
+ return (float) Math.sqrt(org.dreeam.leaf.LeafBootstrap.enableFMA ? Math.fma(dx, dx, Math.fma(dy, dy, dz * dz)) : dx * dx + dy * dy + dz * dz);
|
|
+ }
|
|
+
|
|
+ public final double distanceToSqr(final double x, final double y, final double z) {
|
|
+ final double dx = this.getX() - x;
|
|
+ final double dy = this.getY() - y;
|
|
+ final double dz = this.getZ() - z;
|
|
+ return org.dreeam.leaf.LeafBootstrap.enableFMA ? Math.fma(dx, dx, Math.fma(dy, dy, dz * dz)) : dx * dx + dy * dy + dz * dz;
|
|
+ }
|
|
+
|
|
+ public final double distanceToSqr(Vec3 vector) {
|
|
+ final double dx = this.getX() - vector.x;
|
|
+ final double dy = this.getY() - vector.y;
|
|
+ final double dz = this.getZ() - vector.z;
|
|
+ return org.dreeam.leaf.LeafBootstrap.enableFMA ? Math.fma(dx, dx, Math.fma(dy, dy, dz * dz)) : dx * dx + dy * dy + dz * dz;
|
|
+ }
|
|
+
|
|
+ public double distanceToSqr(Entity entity) {
|
|
+ return this.distanceToSqr(entity.position());
|
|
+ }
|
|
+ // Leaf end - Optimize Entity distanceToSqr
|
|
}
|