Skip to content

Commit 6c60085

Browse files
MrHua269MrHua269
committed
Removed entity fluid looking up optimizations
1 parent 1299dbf commit 6c60085

26 files changed

+9
-231
lines changed

‎patches/server/0030-Pufferfish-Reduce-entity-fluid-lookups-if-no-fluids.patch

Lines changed: 0 additions & 222 deletions
This file was deleted.

‎patches/server/0031-Pufferfish-Reduce-projectile-chunk-loading.patch renamed to ‎patches/server/0030-Pufferfish-Reduce-projectile-chunk-loading.patch

File renamed without changes.

‎patches/server/0032-Pufferfish-Entity-TTL.patch renamed to ‎patches/server/0031-Pufferfish-Entity-TTL.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ index 0000000000000000000000000000000000000000..15697d69659b6e1e776acf5094684b5f
4949
+ }
5050
+}
5151
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
52-
index 44a08cc2e94d52747ba6a66e4b57543dfa5f66c2..d5ad15b95a4f1a0145821ca8a6362e4d5722bf7b 100644
52+
index 3958bc6d5172698af88555352a5321083c2367d3..1aaa53cc5baf31298db1c839641ceff30031f5c3 100644
5353
--- a/src/main/java/net/minecraft/world/entity/Entity.java
5454
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
5555
@@ -858,6 +858,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

‎patches/server/0033-Pufferfish-Dynamic-Activation-of-Brain.patch renamed to ‎patches/server/0032-Pufferfish-Dynamic-Activation-of-Brain.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ index b5cb700e2cd1de2f78ad582245208c056fa6fa79..80123dd30328336b02a5e2e3414ece44
8383
if (false && this.shouldDiscardEntity(entity)) { // CraftBukkit - We prevent spawning in general, so this butchering is not needed
8484
entity.discard();
8585
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
86-
index d5ad15b95a4f1a0145821ca8a6362e4d5722bf7b..577a194e9d9828520560e3546dba8532ca18782a 100644
86+
index 1aaa53cc5baf31298db1c839641ceff30031f5c3..05b72a949821f9fdac227e09343e1dd98d4a810a 100644
8787
--- a/src/main/java/net/minecraft/world/entity/Entity.java
8888
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
8989
@@ -430,6 +430,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

‎patches/server/0034-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch renamed to ‎patches/server/0033-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch

File renamed without changes.

‎patches/server/0035-Pufferfish-Optimize-suffocation.patch renamed to ‎patches/server/0034-Pufferfish-Optimize-suffocation.patch

File renamed without changes.

‎patches/server/0036-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch renamed to ‎patches/server/0035-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch

File renamed without changes.

‎patches/server/0037-Pufferfish-Simpler-ShapelessRecipes-comparison-for-V.patch renamed to ‎patches/server/0036-Pufferfish-Simpler-ShapelessRecipes-comparison-for-V.patch

File renamed without changes.

‎patches/server/0038-Gale-Variable-entity-wake-up-duration.patch renamed to ‎patches/server/0037-Gale-Variable-entity-wake-up-duration.patch

File renamed without changes.

‎patches/server/0039-Gale-Optimize-sun-burn-tick.patch renamed to ‎patches/server/0038-Gale-Optimize-sun-burn-tick.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] Gale Optimize sun burn tick
55

66

77
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
8-
index 577a194e9d9828520560e3546dba8532ca18782a..6870db1f03e44e8023e173a0d7a6a7f09f41e989 100644
8+
index 05b72a949821f9fdac227e09343e1dd98d4a810a..ab60afc23f8caa7603efe5e7eb26cf6e27801786 100644
99
--- a/src/main/java/net/minecraft/world/entity/Entity.java
1010
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
1111
@@ -315,7 +315,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

‎patches/server/0040-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch renamed to ‎patches/server/0039-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ index 0000000000000000000000000000000000000000..ed62d25d6cd6dfcf8c5db20ced36eb3d
3131
+ }
3232
+}
3333
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
34-
index 6870db1f03e44e8023e173a0d7a6a7f09f41e989..928f53951b2c47fb0a5dbae4dc6b8b97f78f4555 100644
34+
index ab60afc23f8caa7603efe5e7eb26cf6e27801786..03a9e5879ef8d579816b6ff70037fb00007bc824 100644
3535
--- a/src/main/java/net/minecraft/world/entity/Entity.java
3636
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
37-
@@ -5559,6 +5559,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
37+
@@ -5427,6 +5427,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
3838
return this.inBlockState;
3939
}
4040

‎patches/server/0041-Gale-Use-platform-math-functions.patch renamed to ‎patches/server/0040-Gale-Use-platform-math-functions.patch

File renamed without changes.

‎patches/server/0042-Gale-Skip-entity-move-if-movement-is-zero.patch renamed to ‎patches/server/0041-Gale-Skip-entity-move-if-movement-is-zero.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] Gale Skip entity move if movement is zero
55

66

77
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
8-
index 928f53951b2c47fb0a5dbae4dc6b8b97f78f4555..ceb0bf3071865c85dfa5a270150ff487c2c02c4c 100644
8+
index 03a9e5879ef8d579816b6ff70037fb00007bc824..548d95943ef25b6895f0f48b2861eb9996277d79 100644
99
--- a/src/main/java/net/minecraft/world/entity/Entity.java
1010
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
1111
@@ -324,6 +324,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

‎patches/server/0043-Gale-Optimize-noise-generation.patch renamed to ‎patches/server/0042-Gale-Optimize-noise-generation.patch

File renamed without changes.

‎patches/server/0044-Gale-Faster-chunk-serialization.patch renamed to ‎patches/server/0043-Gale-Faster-chunk-serialization.patch

File renamed without changes.

‎patches/server/0045-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch renamed to ‎patches/server/0044-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch

File renamed without changes.

‎patches/server/0046-Gale-Replace-throttle-tracker-map-with-optimized-col.patch renamed to ‎patches/server/0045-Gale-Replace-throttle-tracker-map-with-optimized-col.patch

File renamed without changes.

‎patches/server/0047-Sparkly-Paper-Optimize-canSee-checks.patch renamed to ‎patches/server/0046-Sparkly-Paper-Optimize-canSee-checks.patch

File renamed without changes.

‎patches/server/0048-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch renamed to ‎patches/server/0047-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch

File renamed without changes.

‎patches/server/0049-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch renamed to ‎patches/server/0048-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch

File renamed without changes.

‎patches/server/0050-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch renamed to ‎patches/server/0049-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -332,10 +332,10 @@ index 1859477e96709368683fe5707327e92f56fbfc8e..4c4814094552fa4382b1cbe649f24f47
332332
+ // KioCG end
333333
}
334334
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
335-
index ceb0bf3071865c85dfa5a270150ff487c2c02c4c..ae39e58170085f83303d53eb6b7eb72f0a961be3 100644
335+
index 548d95943ef25b6895f0f48b2861eb9996277d79..06beb2c8dbdc070083a3e10c500ed537da9b4a2d 100644
336336
--- a/src/main/java/net/minecraft/world/entity/Entity.java
337337
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
338-
@@ -5999,4 +5999,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
338+
@@ -5867,4 +5867,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
339339
return ((net.minecraft.server.level.ServerChunkCache) level.getChunkSource()).isPositionTicking(this);
340340
}
341341
// Paper end - Expose entity id counter

‎patches/server/0051-Purpur-use-alternative-keep-alive.patch renamed to ‎patches/server/0050-Purpur-use-alternative-keep-alive.patch

File renamed without changes.

‎patches/server/0052-Leaf-Skip-event-if-no-listeners.patch renamed to ‎patches/server/0051-Leaf-Skip-event-if-no-listeners.patch

File renamed without changes.

‎patches/server/0053-Threaded-region-start-tick-and-finished-tick-event.patch renamed to ‎patches/server/0052-Threaded-region-start-tick-and-finished-tick-event.patch

File renamed without changes.

‎patches/server/0054-Fix-MC-2025.patch renamed to ‎patches/server/0053-Fix-MC-2025.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix-MC-2025
55

66

77
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
8-
index ae39e58170085f83303d53eb6b7eb72f0a961be3..133fd4c50df80420015d0c32f487f0176ad07393 100644
8+
index 06beb2c8dbdc070083a3e10c500ed537da9b4a2d..d5d05c947d7dea9a31b59aca1956aeecd2395c0c 100644
99
--- a/src/main/java/net/minecraft/world/entity/Entity.java
1010
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
1111
@@ -2623,6 +2623,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

‎patches/server/0055-FoliaPR-Add-TPS-From-Region.patch renamed to ‎patches/server/0054-FoliaPR-Add-TPS-From-Region.patch

File renamed without changes.

0 commit comments

Comments
 (0)