Removed entity fluid looking up optimizations

LuminolMC · Aug 6, 2024 · 6c60085 · 6c60085
1 parent 1299dbf
commit 6c60085
Show file tree

Hide file tree

Showing 26 changed files with 9 additions and 231 deletions.
diff --git a/patches/server/0030-Pufferfish-Reduce-entity-fluid-lookups-if-no-fluids.patch b/patches/server/0030-Pufferfish-Reduce-entity-fluid-lookups-if-no-fluids.patch
diff --git a/...ish-Reduce-projectile-chunk-loading.patch → ...ish-Reduce-projectile-chunk-loading.patch b/...ish-Reduce-projectile-chunk-loading.patch → ...ish-Reduce-projectile-chunk-loading.patch
diff --git a/...s/server/0032-Pufferfish-Entity-TTL.patch → ...s/server/0031-Pufferfish-Entity-TTL.patch b/...s/server/0032-Pufferfish-Entity-TTL.patch → ...s/server/0031-Pufferfish-Entity-TTL.patch
@@ -49,7 +49,7 @@ index 0000000000000000000000000000000000000000..15697d69659b6e1e776acf5094684b5f
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 44a08cc2e94d52747ba6a66e4b57543dfa5f66c2..d5ad15b95a4f1a0145821ca8a6362e4d5722bf7b 100644
+index 3958bc6d5172698af88555352a5321083c2367d3..1aaa53cc5baf31298db1c839641ceff30031f5c3 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -858,6 +858,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

diff --git a/...ferfish-Dynamic-Activation-of-Brain.patch → ...ferfish-Dynamic-Activation-of-Brain.patch b/...ferfish-Dynamic-Activation-of-Brain.patch → ...ferfish-Dynamic-Activation-of-Brain.patch
@@ -83,7 +83,7 @@ index b5cb700e2cd1de2f78ad582245208c056fa6fa79..80123dd30328336b02a5e2e3414ece44
                      if (false && this.shouldDiscardEntity(entity)) { // CraftBukkit - We prevent spawning in general, so this butchering is not needed
                          entity.discard();
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index d5ad15b95a4f1a0145821ca8a6362e4d5722bf7b..577a194e9d9828520560e3546dba8532ca18782a 100644
+index 1aaa53cc5baf31298db1c839641ceff30031f5c3..05b72a949821f9fdac227e09343e1dd98d4a810a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -430,6 +430,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

diff --git a/...heck-for-spooky-season-once-an-hour.patch → ...heck-for-spooky-season-once-an-hour.patch b/...heck-for-spooky-season-once-an-hour.patch → ...heck-for-spooky-season-once-an-hour.patch
diff --git a/...035-Pufferfish-Optimize-suffocation.patch → ...034-Pufferfish-Optimize-suffocation.patch b/...035-Pufferfish-Optimize-suffocation.patch → ...034-Pufferfish-Optimize-suffocation.patch
diff --git a/...le-goal-selector-during-inactive-ti.patch → ...le-goal-selector-during-inactive-ti.patch b/...le-goal-selector-during-inactive-ti.patch → ...le-goal-selector-during-inactive-ti.patch
diff --git a/...r-ShapelessRecipes-comparison-for-V.patch → ...r-ShapelessRecipes-comparison-for-V.patch b/...r-ShapelessRecipes-comparison-for-V.patch → ...r-ShapelessRecipes-comparison-for-V.patch
diff --git a/...le-Variable-entity-wake-up-duration.patch → ...le-Variable-entity-wake-up-duration.patch b/...le-Variable-entity-wake-up-duration.patch → ...le-Variable-entity-wake-up-duration.patch
diff --git a/...er/0039-Gale-Optimize-sun-burn-tick.patch → ...er/0038-Gale-Optimize-sun-burn-tick.patch b/...er/0039-Gale-Optimize-sun-burn-tick.patch → ...er/0038-Gale-Optimize-sun-burn-tick.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Gale Optimize sun burn tick
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 577a194e9d9828520560e3546dba8532ca18782a..6870db1f03e44e8023e173a0d7a6a7f09f41e989 100644
+index 05b72a949821f9fdac227e09343e1dd98d4a810a..ab60afc23f8caa7603efe5e7eb26cf6e27801786 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -315,7 +315,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

diff --git a/...hunks-to-activate-climbing-entities.patch → ...hunks-to-activate-climbing-entities.patch b/...hunks-to-activate-climbing-entities.patch → ...hunks-to-activate-climbing-entities.patch
@@ -31,10 +31,10 @@ index 0000000000000000000000000000000000000000..ed62d25d6cd6dfcf8c5db20ced36eb3d
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 6870db1f03e44e8023e173a0d7a6a7f09f41e989..928f53951b2c47fb0a5dbae4dc6b8b97f78f4555 100644
+index ab60afc23f8caa7603efe5e7eb26cf6e27801786..03a9e5879ef8d579816b6ff70037fb00007bc824 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -5559,6 +5559,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -5427,6 +5427,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          return this.inBlockState;
      }
 

diff --git a/...41-Gale-Use-platform-math-functions.patch → ...40-Gale-Use-platform-math-functions.patch b/...41-Gale-Use-platform-math-functions.patch → ...40-Gale-Use-platform-math-functions.patch
diff --git a/...kip-entity-move-if-movement-is-zero.patch → ...kip-entity-move-if-movement-is-zero.patch b/...kip-entity-move-if-movement-is-zero.patch → ...kip-entity-move-if-movement-is-zero.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Gale Skip entity move if movement is zero
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 928f53951b2c47fb0a5dbae4dc6b8b97f78f4555..ceb0bf3071865c85dfa5a270150ff487c2c02c4c 100644
+index 03a9e5879ef8d579816b6ff70037fb00007bc824..548d95943ef25b6895f0f48b2861eb9996277d79 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -324,6 +324,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

diff --git a/...0043-Gale-Optimize-noise-generation.patch → ...0042-Gale-Optimize-noise-generation.patch b/...0043-Gale-Optimize-noise-generation.patch → ...0042-Gale-Optimize-noise-generation.patch
diff --git a/...044-Gale-Faster-chunk-serialization.patch → ...043-Gale-Faster-chunk-serialization.patch b/...044-Gale-Faster-chunk-serialization.patch → ...043-Gale-Faster-chunk-serialization.patch
diff --git a/...a-and-Optional-allocation-in-Entity.patch → ...a-and-Optional-allocation-in-Entity.patch b/...a-and-Optional-allocation-in-Entity.patch → ...a-and-Optional-allocation-in-Entity.patch
diff --git a/...ttle-tracker-map-with-optimized-col.patch → ...ttle-tracker-map-with-optimized-col.patch b/...ttle-tracker-map-with-optimized-col.patch → ...ttle-tracker-map-with-optimized-col.patch
diff --git a/...parkly-Paper-Optimize-canSee-checks.patch → ...parkly-Paper-Optimize-canSee-checks.patch b/...parkly-Paper-Optimize-canSee-checks.patch → ...parkly-Paper-Optimize-canSee-checks.patch
diff --git a/...-MapItem-update-if-the-map-does-not.patch → ...-MapItem-update-if-the-map-does-not.patch b/...-MapItem-update-if-the-map-does-not.patch → ...-MapItem-update-if-the-map-does-not.patch
diff --git a/...-distanceToSqr-call-in-ServerEntity.patch → ...-distanceToSqr-call-in-ServerEntity.patch b/...-distanceToSqr-call-in-ServerEntity.patch → ...-distanceToSqr-call-in-ServerEntity.patch
diff --git a/...I-and-display-of-chunkhot-in-tpsbar.patch → ...I-and-display-of-chunkhot-in-tpsbar.patch b/...I-and-display-of-chunkhot-in-tpsbar.patch → ...I-and-display-of-chunkhot-in-tpsbar.patch
@@ -332,10 +332,10 @@ index 1859477e96709368683fe5707327e92f56fbfc8e..4c4814094552fa4382b1cbe649f24f47
 +    // KioCG end
  }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ceb0bf3071865c85dfa5a270150ff487c2c02c4c..ae39e58170085f83303d53eb6b7eb72f0a961be3 100644
+index 548d95943ef25b6895f0f48b2861eb9996277d79..06beb2c8dbdc070083a3e10c500ed537da9b4a2d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -5999,4 +5999,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -5867,4 +5867,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          return ((net.minecraft.server.level.ServerChunkCache) level.getChunkSource()).isPositionTicking(this);
      }
      // Paper end - Expose entity id counter

diff --git a/...1-Purpur-use-alternative-keep-alive.patch → ...0-Purpur-use-alternative-keep-alive.patch b/...1-Purpur-use-alternative-keep-alive.patch → ...0-Purpur-use-alternative-keep-alive.patch
diff --git a/...052-Leaf-Skip-event-if-no-listeners.patch → ...051-Leaf-Skip-event-if-no-listeners.patch b/...052-Leaf-Skip-event-if-no-listeners.patch → ...051-Leaf-Skip-event-if-no-listeners.patch
diff --git a/...-start-tick-and-finished-tick-event.patch → ...-start-tick-and-finished-tick-event.patch b/...-start-tick-and-finished-tick-event.patch → ...-start-tick-and-finished-tick-event.patch
diff --git a/patches/server/0054-Fix-MC-2025.patch → patches/server/0053-Fix-MC-2025.patch b/patches/server/0054-Fix-MC-2025.patch → patches/server/0053-Fix-MC-2025.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix-MC-2025
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ae39e58170085f83303d53eb6b7eb72f0a961be3..133fd4c50df80420015d0c32f487f0176ad07393 100644
+index 06beb2c8dbdc070083a3e10c500ed537da9b4a2d..d5d05c947d7dea9a31b59aca1956aeecd2395c0c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2623,6 +2623,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

diff --git a/...er/0055-FoliaPR-Add-TPS-From-Region.patch → ...er/0054-FoliaPR-Add-TPS-From-Region.patch b/...er/0055-FoliaPR-Add-TPS-From-Region.patch → ...er/0054-FoliaPR-Add-TPS-From-Region.patch