Temp drop Cache CubeVoxelShape shape array to fix crash

2025-12-22 16:29:26 +00:00 · 2024-06-17 07:23:22 +08:00
parent 13572f9d45
commit e671167ace
49 changed files with 7 additions and 6 deletions
--- a/README.md
+++ b/README.md
@@ -65,3 +65,4 @@ Binaries are licensed under GPL-3.0.
 ## TODO
 check Simpler ShapelessRecipe comparison for vanilla patch
 check fix MC-26304 (needs tryParse? or just parse or withDefaultNamespace)
 check Cache CubeVoxelShape shape array (crash)
--- a/patches/server/0079-Replace-division-by-multiplication-in-CubePointRange.patch
+++ b/patches/server/0079-Replace-division-by-multiplication-in-CubePointRange.patch
--- a/patches/server/0080-Replace-parts-by-size-in-CubePointRange.patch
+++ b/patches/server/0080-Replace-parts-by-size-in-CubePointRange.patch
--- a/patches/server/0081-Check-frozen-ticks-before-landing-block.patch
+++ b/patches/server/0081-Check-frozen-ticks-before-landing-block.patch
@@ -13,7 +13,7 @@ As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric)
 Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html)
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index c24ee33a3c57c8380aa6f0ad7f60baf42b98f1ab..7bdf29e3f71aa995a3125176ef4e62c7a6d4d8fe 100644
+index e70d2a9005f1ba5d6bdd08a70c8de99295759018..41c213db8320331577801a46b469c77fd504c2f9 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -565,11 +565,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
--- a/patches/server/0082-Faster-chunk-serialization.patch
+++ b/patches/server/0082-Faster-chunk-serialization.patch
--- a/patches/server/0083-Update-boss-bar-within-tick.patch
+++ b/patches/server/0083-Update-boss-bar-within-tick.patch
--- a/patches/server/0084-Cache-world-generator-sea-level.patch
+++ b/patches/server/0084-Cache-world-generator-sea-level.patch
--- a/patches/server/0085-Skip-secondary-POI-sensor-if-absent.patch
+++ b/patches/server/0085-Skip-secondary-POI-sensor-if-absent.patch
--- a/patches/server/0086-Skip-entity-move-if-movement-is-zero.patch
+++ b/patches/server/0086-Skip-entity-move-if-movement-is-zero.patch
--- a/patches/server/0087-Store-mob-counts-in-an-array.patch
+++ b/patches/server/0087-Store-mob-counts-in-an-array.patch
--- a/patches/server/0088-Use-linked-map-for-entity-trackers.patch
+++ b/patches/server/0088-Use-linked-map-for-entity-trackers.patch
--- a/patches/server/0089-Optimize-noise-generation.patch
+++ b/patches/server/0089-Optimize-noise-generation.patch
--- a/patches/server/0090-Optimize-sheep-offspring-color.patch
+++ b/patches/server/0090-Optimize-sheep-offspring-color.patch
--- a/patches/server/0091-Hide-flames-on-entities-with-fire-resistance.patch
+++ b/patches/server/0091-Hide-flames-on-entities-with-fire-resistance.patch
--- a/patches/server/0092-Skip-cloning-advancement-criteria.patch
+++ b/patches/server/0092-Skip-cloning-advancement-criteria.patch
--- a/patches/server/0093-Reduce-block-destruction-packet-allocations.patch
+++ b/patches/server/0093-Reduce-block-destruction-packet-allocations.patch
--- a/patches/server/0094-Spread-out-sending-all-player-info.patch
+++ b/patches/server/0094-Spread-out-sending-all-player-info.patch
@@ -37,7 +37,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index fa4ca096dfd3afe8868b76a8576f0f2882f139ca..44990dfc60126bf6bb88679dfbebb09d3ca1473a 100644
+index 7ebe9f2842b76c2a12d8316916d22ff17a45b3ac..6afadb847906050566f0eeb8ba5ad5c539d0c9b7 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -13,6 +13,8 @@ import java.net.SocketAddress;
--- a/patches/server/0095-Optimize-player-list-for-sending-player-info.patch
+++ b/patches/server/0095-Optimize-player-list-for-sending-player-info.patch
@@ -37,7 +37,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 44990dfc60126bf6bb88679dfbebb09d3ca1473a..98efc69c911dd7cdce6c945d1bfebbefc0bbd154 100644
+index 6afadb847906050566f0eeb8ba5ad5c539d0c9b7..16718cec74f7166b00177c8a73fd4d7a30213388 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1018,14 +1018,18 @@ public abstract class PlayerList {
--- a/patches/server/0096-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch
+++ b/patches/server/0096-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch
--- a/patches/server/0097-Send-multiple-keep-alive-packets.patch
+++ b/patches/server/0097-Send-multiple-keep-alive-packets.patch
--- a/patches/server/0098-Make-slow-login-timeout-configurable.patch
+++ b/patches/server/0098-Make-slow-login-timeout-configurable.patch
--- a/patches/server/0099-Load-portal-destination-chunk-before-entity-teleport.patch
+++ b/patches/server/0099-Load-portal-destination-chunk-before-entity-teleport.patch
--- a/patches/server/0100-Don-t-load-chunks-to-spawn-phantoms.patch
+++ b/patches/server/0100-Don-t-load-chunks-to-spawn-phantoms.patch
--- a/patches/server/0101-Don-t-load-chunks-to-activate-climbing-entities.patch
+++ b/patches/server/0101-Don-t-load-chunks-to-activate-climbing-entities.patch
--- a/patches/server/0102-Broadcast-crit-animations-as-the-entity-being-critte.patch
+++ b/patches/server/0102-Broadcast-crit-animations-as-the-entity-being-critte.patch
--- a/patches/server/0103-Ignore-null-legacy-structure-data.patch
+++ b/patches/server/0103-Ignore-null-legacy-structure-data.patch
--- a/patches/server/0104-Skip-unnecessary-mob-spawning-computations.patch
+++ b/patches/server/0104-Skip-unnecessary-mob-spawning-computations.patch
--- a/patches/server/0105-Prevent-entities-random-strolling-into-non-ticking-c.patch
+++ b/patches/server/0105-Prevent-entities-random-strolling-into-non-ticking-c.patch
--- a/patches/server/0106-Do-not-place-player-in-world-if-kicked-before-being-.patch
+++ b/patches/server/0106-Do-not-place-player-in-world-if-kicked-before-being-.patch
@@ -14,7 +14,7 @@ As part of: MultiPaper (https://github.com/MultiPaper/MultiPaper)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 98efc69c911dd7cdce6c945d1bfebbefc0bbd154..5b8687da643ec355d7c0218f763e6f77223c4246 100644
+index 16718cec74f7166b00177c8a73fd4d7a30213388..90191fb36306454fa9741992967eb3d0af6dc584 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -275,6 +275,13 @@ public abstract class PlayerList {
--- a/patches/server/0107-CraftBukkit-UUID-to-world-map.patch
+++ b/patches/server/0107-CraftBukkit-UUID-to-world-map.patch
--- a/patches/server/0108-Global-EULA-file.patch
+++ b/patches/server/0108-Global-EULA-file.patch
--- a/patches/server/0109-Specific-interval-TPS-API.patch
+++ b/patches/server/0109-Specific-interval-TPS-API.patch
--- a/patches/server/0110-5-second-TPS-average.patch
+++ b/patches/server/0110-5-second-TPS-average.patch
--- a/patches/server/0111-Measure-last-tick-time.patch
+++ b/patches/server/0111-Measure-last-tick-time.patch
--- a/patches/server/0112-Last-tick-time-API.patch
+++ b/patches/server/0112-Last-tick-time-API.patch
--- a/patches/server/0113-Show-last-tick-time-in-tps-command.patch
+++ b/patches/server/0113-Show-last-tick-time-in-tps-command.patch
--- a/patches/server/0114-Increase-time-statistics-in-intervals.patch
+++ b/patches/server/0114-Increase-time-statistics-in-intervals.patch
--- a/patches/server/0115-For-collision-check-has-physics-before-same-vehicle.patch
+++ b/patches/server/0115-For-collision-check-has-physics-before-same-vehicle.patch
--- a/patches/server/0116-Skip-negligible-planar-movement-multiplication.patch
+++ b/patches/server/0116-Skip-negligible-planar-movement-multiplication.patch
--- a/patches/server/0117-Optimize-matching-item-checks.patch
+++ b/patches/server/0117-Optimize-matching-item-checks.patch
--- a/patches/server/0118-Pre-compute-VarLong-sizes.patch
+++ b/patches/server/0118-Pre-compute-VarLong-sizes.patch
--- a/patches/server/0119-Optimize-VarInt-write-and-VarLong-write.patch
+++ b/patches/server/0119-Optimize-VarInt-write-and-VarLong-write.patch
--- a/patches/server/0120-Reduce-RandomSource-instances.patch
+++ b/patches/server/0120-Reduce-RandomSource-instances.patch
--- a/patches/server/0121-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch
+++ b/patches/server/0121-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch
@@ -18,7 +18,7 @@ this patch is focused around the sensors used for ai
 delete the line of sight cache less often and use a faster nearby comparison
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 93f9905bbb47d89c746957f4e3e75e13322e2a5e..5c99f85777f8ab02428a3c5c9afc90dee6d4347e 100644
+index 60493d257489affb2e622d9c7193e1f8e7fad412..620f59c9563d7215ee04176eaa74872918f011d6 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1029,10 +1029,9 @@ public abstract class LivingEntity extends Entity implements Attackable {
--- a/patches/server/0122-Initialize-line-of-sight-cache-with-low-capacity.patch
+++ b/patches/server/0122-Initialize-line-of-sight-cache-with-low-capacity.patch
--- a/patches/server/0123-Reduce-line-of-sight-updates-and-cache-lookups.patch
+++ b/patches/server/0123-Reduce-line-of-sight-updates-and-cache-lookups.patch
--- a/patches/server/0124-Server-thread-priority-environment-variable.patch
+++ b/patches/server/0124-Server-thread-priority-environment-variable.patch
--- a/patches/server/0125-Virtual-thread-support.patch
+++ b/patches/server/0125-Virtual-thread-support.patch
--- a/patches/work/server/0079-Cache-CubeVoxelShape-shape-array.patch
+++ b/patches/work/server/0079-Cache-CubeVoxelShape-shape-array.patch