mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-30 12:29:13 +00:00
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@89cdcba5 [ci/skip] Replace wiki mention for BlockType#isOccluding (#12446) PaperMC/Paper@5f0b8292 Re-add chunk position check to regionfile recalculation patch PaperMC/Paper@04b91129 Update projects dependents GitHub Action (#12436) PaperMC/Paper@def0532f Fix writing headers and update to be more papery (#12459) PaperMC/Paper@d22644aa Expand cooldown API (#12435) PaperMC/Paper@df429932 Fix floating warning log when the kick event is canceled (#12374) PaperMC/Paper@a820bdae [ci/skip] Some javadoc fixes PaperMC/Paper@55f20209 Fix CCE in LingeringPotionSplashEvent (#12463) PaperMC/Paper@1410a22b Fix passengers sending when riding players PaperMC/Paper@767868dd Fix some components (#12457) PaperMC/Paper@9cddf136 Fix portal create event block list (#12373) PaperMC/Paper@a112d370 Fix horse_variant and tropical_fish_pattern (#12472) PaperMC/Paper@a211ac2e Remove unused warning (#12478) PaperMC/Paper@ae512811 Add isSuffocating to Block and BlockState (#12445) PaperMC/Paper@3409e2d7 Mace was not included in the ENCHANTABLE MaterialSetTag (#12476) PaperMC/Paper@1cfc96bc Add keyStream() API to registries (#12479) PaperMC/Paper@3222985e [ci/skip] Rebuild patches PaperMC/Paper@deaccd2c [ci/skip] Add file reference url to help.yml (#12481) PaperMC/Paper@f86b4352 Add vault change state event (#12069) PaperMC/Paper@3e3b42cd Update player chat session sync (#12382) PaperMC/Paper@f8fa4f6f Add method to retrieve FishHook (#12310) PaperMC/Paper@b9d3147d Use correct placed block position for sound (#12410) PaperMC/Paper@952338b3 [ci/skip] Add missing exception docs to Player#listPlayer (#12488) PaperMC/Paper@1db37853 [ci/skip] improve javadoc for off-hand swaps through getHotbarButton (#12489) PaperMC/Paper@d1810f24 Allow Server#getDefaultGameMode before worlds are initialized (#12490) PaperMC/Paper@02d20ff7 Fix NPE in Server#getMap before worlds are loaded (#12492) PaperMC/Paper@9e873f50 Fix inconsistencies between offline/online spawn position getter (#11960) PaperMC/Paper@fc0c3717 Fix handling of resultant crafting container from craftItemResult (#12307) PaperMC/Paper@a7a76c8f Add methods for Armadillo (#12031) PaperMC/Paper@a74400d9 Update adventure to 4.21.0 (#12499) PaperMC/Paper@1e930763 Fix ipv6 loopback addresses being able to get connection throttled (#12155) PaperMC/Paper@646b80ca Fix unnecessary map data saves (#12296) PaperMC/Paper@e663f999 Add combat tracker API (#11853) PaperMC/Paper@cd4fe5b7 [ci/skip] Drop non-applicable ATs (#12498) PaperMC/Paper@5acfdd6a Fix save/load NaN Entity Motion (#12269) PaperMC/Paper@2754d7c3 Add Throw EntityChangeBlockEvent for BrushableBlockEntity#brush (#12133) PaperMC/Paper@567f63ae Parity for respawn events (#11792) PaperMC/Paper@bc3d946f Normalizes CraftEntity#toString/getHandle (#12170) PaperMC/Paper@0e9b94d5 Fix ItemStack amount issues with Chat Components (#12216) PaperMC/Paper@835b9559 Add a method on InventoryView to get the MenuType (#12193) PaperMC/Paper@c9411bfb Fix min ItemStack amount check for asHoverEvent (#12505) PaperMC/Paper@1acf3b38 Infer block entity data in brigadier blockstate argument (#12197) PaperMC/Paper@b9b3cd65 Use components instead of ChatColor in more places (#12507) PaperMC/Paper@ec421715 Add missing spaces back (#12508) Purpur Changes: PurpurMC/Purpur@c3870bda Updated Upstream (Paper) PurpurMC/Purpur@8b5044e0 [ci/skip] add idea project icon PurpurMC/Purpur@f2f682fb Updated Upstream (Paper) PurpurMC/Purpur@bdeba761 Updated Upstream (Paper) PurpurMC/Purpur@96f5b044 drop void damage height/damage migration PurpurMC/Purpur@6cc78b63 Updated Upstream (Paper) PurpurMC/Purpur@4ce97c1d [ci/skip] Update occurences of version numbers to 1.21.5 (#1658) PurpurMC/Purpur@7f5c4036 Updated Upstream (Paper) PurpurMC/Purpur@4fdf1d11 Updated Upstream (Paper) PurpurMC/Purpur@8c77678e 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 689d5d215ab372b482ad715fc86df257ba04ed53..0fc0a69d377060aab39f179240c25031bebb2d97 100644
|
|
--- a/net/minecraft/world/entity/Entity.java
|
|
+++ b/net/minecraft/world/entity/Entity.java
|
|
@@ -2186,31 +2186,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) {
|
|
}
|
|
|
|
@@ -5249,4 +5224,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
|
|
}
|