From 480824b688d93e7bce9fb3b8356c7f6716c77c09 Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Thu, 12 Dec 2024 03:53:52 -0500 Subject: [PATCH] Removed `Load portal destination chunk before entity teleport` --- ...ad-portal-destination-chunk-before-entity-teleport.patch | 3 +++ ...patch => 0093-Don-t-load-chunks-to-spawn-phantoms.patch} | 2 +- ...4-Don-t-load-chunks-to-activate-climbing-entities.patch} | 6 +++--- ...adcast-crit-animations-as-the-entity-being-critte.patch} | 2 +- ...a.patch => 0096-Ignore-null-legacy-structure-data.patch} | 0 ...> 0097-Skip-unnecessary-mob-spawning-computations.patch} | 0 ...vent-entities-random-strolling-into-non-ticking-c.patch} | 4 ++-- ...not-place-player-in-world-if-kicked-before-being-.patch} | 0 ...d-map.patch => 0100-CraftBukkit-UUID-to-world-map.patch} | 0 ...2-Global-EULA-file.patch => 0101-Global-EULA-file.patch} | 0 ...l-TPS-API.patch => 0102-Specific-interval-TPS-API.patch} | 0 ...nd-TPS-average.patch => 0103-5-second-TPS-average.patch} | 0 ...st-tick-time.patch => 0104-Measure-last-tick-time.patch} | 0 ...st-tick-time-API.patch => 0105-Last-tick-time-API.patch} | 0 ....patch => 0106-Show-last-tick-time-in-tps-command.patch} | 0 ...tch => 0107-Increase-time-statistics-in-intervals.patch} | 0 ...r-collision-check-has-physics-before-same-vehicle.patch} | 2 +- ...09-Skip-negligible-planar-movement-multiplication.patch} | 2 +- ...hecks.patch => 0110-Optimize-matching-item-checks.patch} | 0 ...ong-sizes.patch => 0111-Pre-compute-VarLong-sizes.patch} | 0 ...h => 0112-Optimize-VarInt-write-and-VarLong-write.patch} | 0 ...ances.patch => 0113-Reduce-RandomSource-instances.patch} | 0 ...r-shift-random.patch => 0114-Add-xor-shift-random.patch} | 0 ...uce-skull-ItemStack-lookups-for-reduced-visibilit.patch} | 0 ...-Initialize-line-of-sight-cache-with-low-capacity.patch} | 0 ...17-Reduce-line-of-sight-updates-and-cache-lookups.patch} | 0 ... 0118-Server-thread-priority-environment-variable.patch} | 0 ...read-support.patch => 0119-Virtual-thread-support.patch} | 0 28 files changed, 12 insertions(+), 9 deletions(-) rename patches/{ => removed}/server/0093-Load-portal-destination-chunk-before-entity-teleport.patch (95%) rename patches/server/{0094-Don-t-load-chunks-to-spawn-phantoms.patch => 0093-Don-t-load-chunks-to-spawn-phantoms.patch} (97%) rename patches/server/{0095-Don-t-load-chunks-to-activate-climbing-entities.patch => 0094-Don-t-load-chunks-to-activate-climbing-entities.patch} (94%) rename patches/server/{0096-Broadcast-crit-animations-as-the-entity-being-critte.patch => 0095-Broadcast-crit-animations-as-the-entity-being-critte.patch} (96%) rename patches/server/{0097-Ignore-null-legacy-structure-data.patch => 0096-Ignore-null-legacy-structure-data.patch} (100%) rename patches/server/{0098-Skip-unnecessary-mob-spawning-computations.patch => 0097-Skip-unnecessary-mob-spawning-computations.patch} (100%) rename patches/server/{0099-Prevent-entities-random-strolling-into-non-ticking-c.patch => 0098-Prevent-entities-random-strolling-into-non-ticking-c.patch} (94%) rename patches/server/{0100-Do-not-place-player-in-world-if-kicked-before-being-.patch => 0099-Do-not-place-player-in-world-if-kicked-before-being-.patch} (100%) rename patches/server/{0101-CraftBukkit-UUID-to-world-map.patch => 0100-CraftBukkit-UUID-to-world-map.patch} (100%) rename patches/server/{0102-Global-EULA-file.patch => 0101-Global-EULA-file.patch} (100%) rename patches/server/{0103-Specific-interval-TPS-API.patch => 0102-Specific-interval-TPS-API.patch} (100%) rename patches/server/{0104-5-second-TPS-average.patch => 0103-5-second-TPS-average.patch} (100%) rename patches/server/{0105-Measure-last-tick-time.patch => 0104-Measure-last-tick-time.patch} (100%) rename patches/server/{0106-Last-tick-time-API.patch => 0105-Last-tick-time-API.patch} (100%) rename patches/server/{0107-Show-last-tick-time-in-tps-command.patch => 0106-Show-last-tick-time-in-tps-command.patch} (100%) rename patches/server/{0108-Increase-time-statistics-in-intervals.patch => 0107-Increase-time-statistics-in-intervals.patch} (100%) rename patches/server/{0109-For-collision-check-has-physics-before-same-vehicle.patch => 0108-For-collision-check-has-physics-before-same-vehicle.patch} (94%) rename patches/server/{0110-Skip-negligible-planar-movement-multiplication.patch => 0109-Skip-negligible-planar-movement-multiplication.patch} (94%) rename patches/server/{0111-Optimize-matching-item-checks.patch => 0110-Optimize-matching-item-checks.patch} (100%) rename patches/server/{0112-Pre-compute-VarLong-sizes.patch => 0111-Pre-compute-VarLong-sizes.patch} (100%) rename patches/server/{0113-Optimize-VarInt-write-and-VarLong-write.patch => 0112-Optimize-VarInt-write-and-VarLong-write.patch} (100%) rename patches/server/{0114-Reduce-RandomSource-instances.patch => 0113-Reduce-RandomSource-instances.patch} (100%) rename patches/server/{0115-Add-xor-shift-random.patch => 0114-Add-xor-shift-random.patch} (100%) rename patches/server/{0116-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch => 0115-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch} (100%) rename patches/server/{0117-Initialize-line-of-sight-cache-with-low-capacity.patch => 0116-Initialize-line-of-sight-cache-with-low-capacity.patch} (100%) rename patches/server/{0118-Reduce-line-of-sight-updates-and-cache-lookups.patch => 0117-Reduce-line-of-sight-updates-and-cache-lookups.patch} (100%) rename patches/server/{0119-Server-thread-priority-environment-variable.patch => 0118-Server-thread-priority-environment-variable.patch} (100%) rename patches/server/{0120-Virtual-thread-support.patch => 0119-Virtual-thread-support.patch} (100%) diff --git a/patches/server/0093-Load-portal-destination-chunk-before-entity-teleport.patch b/patches/removed/server/0093-Load-portal-destination-chunk-before-entity-teleport.patch similarity index 95% rename from patches/server/0093-Load-portal-destination-chunk-before-entity-teleport.patch rename to patches/removed/server/0093-Load-portal-destination-chunk-before-entity-teleport.patch index 2a3a856..1953ac5 100644 --- a/patches/server/0093-Load-portal-destination-chunk-before-entity-teleport.patch +++ b/patches/removed/server/0093-Load-portal-destination-chunk-before-entity-teleport.patch @@ -3,6 +3,9 @@ From: Martijn Muijsers <martijnmuijsers@live.nl> Date: Sun, 25 Dec 2022 16:55:45 +0100 Subject: [PATCH] Load portal destination chunk before entity teleport +Removed since Gale 1.21.3, entity can teleport cross dimension since 1.21.1 +also see 1.21.1 update in mc wiki for more info + License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) Gale - https://galemc.org diff --git a/patches/server/0094-Don-t-load-chunks-to-spawn-phantoms.patch b/patches/server/0093-Don-t-load-chunks-to-spawn-phantoms.patch similarity index 97% rename from patches/server/0094-Don-t-load-chunks-to-spawn-phantoms.patch rename to patches/server/0093-Don-t-load-chunks-to-spawn-phantoms.patch index 20bc918..6732304 100644 --- a/patches/server/0094-Don-t-load-chunks-to-spawn-phantoms.patch +++ b/patches/server/0093-Don-t-load-chunks-to-spawn-phantoms.patch @@ -34,7 +34,7 @@ index 021221da5d0315f6e371380a705ac6b3f6ac18d3..997f80d332b95bb011cbbc27c065b281 if (NaturalSpawner.isValidEmptySpawnBlock(world, blockposition1, iblockdata, fluid, EntityType.PHANTOM)) { diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 63ff60f9d5d9a8a5ea36754dd394696b54082d93..0c1a45ae1e4633a873a37ad4382b3a365331b0fa 100644 +index ecd4cf29a03d6f4ee71450b1c0d952209e40be4a..61d6da8509837bfba30a139a84b0bc452ed4046b 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -92,6 +92,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { diff --git a/patches/server/0095-Don-t-load-chunks-to-activate-climbing-entities.patch b/patches/server/0094-Don-t-load-chunks-to-activate-climbing-entities.patch similarity index 94% rename from patches/server/0095-Don-t-load-chunks-to-activate-climbing-entities.patch rename to patches/server/0094-Don-t-load-chunks-to-activate-climbing-entities.patch index c0aae93..d1d98e7 100644 --- a/patches/server/0095-Don-t-load-chunks-to-activate-climbing-entities.patch +++ b/patches/server/0094-Don-t-load-chunks-to-activate-climbing-entities.patch @@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) Gale - https://galemc.org diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 4865759b5ad05997b7777a8cd036967083c2ef39..205319053d1cadeebc2e3475330f220bccef7f6b 100644 +index ce11e73e7a91c9d45f62552ab1cd7bec47b2a879..840534b87550d86b1d894ddd0916f9cbcaa688aa 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -4919,6 +4919,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -4912,6 +4912,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess return this.inBlockState; } @@ -79,7 +79,7 @@ index 887adb618a6eb158b53a96e57d785583a3ac322f..9551c2b75687bd036aaabd9593df7d96 if (iblockdata.is(BlockTags.CLIMBABLE)) { this.lastClimbablePos = Optional.of(blockposition); diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 0c1a45ae1e4633a873a37ad4382b3a365331b0fa..a61817385d2874454ba6326898e47ffda2cdaca8 100644 +index 61d6da8509837bfba30a139a84b0bc452ed4046b..e6ffd32986e587f4a8a6f98611ab6c02b96912e2 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -95,6 +95,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { diff --git a/patches/server/0096-Broadcast-crit-animations-as-the-entity-being-critte.patch b/patches/server/0095-Broadcast-crit-animations-as-the-entity-being-critte.patch similarity index 96% rename from patches/server/0096-Broadcast-crit-animations-as-the-entity-being-critte.patch rename to patches/server/0095-Broadcast-crit-animations-as-the-entity-being-critte.patch index a9500ee..641fa94 100644 --- a/patches/server/0096-Broadcast-crit-animations-as-the-entity-being-critte.patch +++ b/patches/server/0095-Broadcast-crit-animations-as-the-entity-being-critte.patch @@ -38,7 +38,7 @@ index 61ef647d61a8e2df209f79b7518c802feb85ac66..75c6d238fdbe434ea95db2c84da4461a @Override diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index a61817385d2874454ba6326898e47ffda2cdaca8..5d26566c0d58fbd61d8f2d01b09343a89b280df5 100644 +index e6ffd32986e587f4a8a6f98611ab6c02b96912e2..7ac5b7891963d1b4b3a2ae3ce27a284ccee42a70 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -106,6 +106,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { diff --git a/patches/server/0097-Ignore-null-legacy-structure-data.patch b/patches/server/0096-Ignore-null-legacy-structure-data.patch similarity index 100% rename from patches/server/0097-Ignore-null-legacy-structure-data.patch rename to patches/server/0096-Ignore-null-legacy-structure-data.patch diff --git a/patches/server/0098-Skip-unnecessary-mob-spawning-computations.patch b/patches/server/0097-Skip-unnecessary-mob-spawning-computations.patch similarity index 100% rename from patches/server/0098-Skip-unnecessary-mob-spawning-computations.patch rename to patches/server/0097-Skip-unnecessary-mob-spawning-computations.patch diff --git a/patches/server/0099-Prevent-entities-random-strolling-into-non-ticking-c.patch b/patches/server/0098-Prevent-entities-random-strolling-into-non-ticking-c.patch similarity index 94% rename from patches/server/0099-Prevent-entities-random-strolling-into-non-ticking-c.patch rename to patches/server/0098-Prevent-entities-random-strolling-into-non-ticking-c.patch index af4c77d..fcd56be 100644 --- a/patches/server/0099-Prevent-entities-random-strolling-into-non-ticking-c.patch +++ b/patches/server/0098-Prevent-entities-random-strolling-into-non-ticking-c.patch @@ -26,10 +26,10 @@ index 676e1580849e8942eb41c7a3a80f464138b22764..129591f1bb9cc687a2873855e7bc58f8 } else { this.wantedX = vec3.x; diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 5d26566c0d58fbd61d8f2d01b09343a89b280df5..ce6b525ad25b718941e8216c06c6da7caf890099 100644 +index 7ac5b7891963d1b4b3a2ae3ce27a284ccee42a70..5b9e55bc9c7a67487400f59ba6bfaa9f68c6504a 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -132,6 +132,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -127,6 +127,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { } public boolean arrowMovementResetsDespawnCounter = true; // Gale - Purpur - make arrow movement resetting despawn counter configurable diff --git a/patches/server/0100-Do-not-place-player-in-world-if-kicked-before-being-.patch b/patches/server/0099-Do-not-place-player-in-world-if-kicked-before-being-.patch similarity index 100% rename from patches/server/0100-Do-not-place-player-in-world-if-kicked-before-being-.patch rename to patches/server/0099-Do-not-place-player-in-world-if-kicked-before-being-.patch diff --git a/patches/server/0101-CraftBukkit-UUID-to-world-map.patch b/patches/server/0100-CraftBukkit-UUID-to-world-map.patch similarity index 100% rename from patches/server/0101-CraftBukkit-UUID-to-world-map.patch rename to patches/server/0100-CraftBukkit-UUID-to-world-map.patch diff --git a/patches/server/0102-Global-EULA-file.patch b/patches/server/0101-Global-EULA-file.patch similarity index 100% rename from patches/server/0102-Global-EULA-file.patch rename to patches/server/0101-Global-EULA-file.patch diff --git a/patches/server/0103-Specific-interval-TPS-API.patch b/patches/server/0102-Specific-interval-TPS-API.patch similarity index 100% rename from patches/server/0103-Specific-interval-TPS-API.patch rename to patches/server/0102-Specific-interval-TPS-API.patch diff --git a/patches/server/0104-5-second-TPS-average.patch b/patches/server/0103-5-second-TPS-average.patch similarity index 100% rename from patches/server/0104-5-second-TPS-average.patch rename to patches/server/0103-5-second-TPS-average.patch diff --git a/patches/server/0105-Measure-last-tick-time.patch b/patches/server/0104-Measure-last-tick-time.patch similarity index 100% rename from patches/server/0105-Measure-last-tick-time.patch rename to patches/server/0104-Measure-last-tick-time.patch diff --git a/patches/server/0106-Last-tick-time-API.patch b/patches/server/0105-Last-tick-time-API.patch similarity index 100% rename from patches/server/0106-Last-tick-time-API.patch rename to patches/server/0105-Last-tick-time-API.patch diff --git a/patches/server/0107-Show-last-tick-time-in-tps-command.patch b/patches/server/0106-Show-last-tick-time-in-tps-command.patch similarity index 100% rename from patches/server/0107-Show-last-tick-time-in-tps-command.patch rename to patches/server/0106-Show-last-tick-time-in-tps-command.patch diff --git a/patches/server/0108-Increase-time-statistics-in-intervals.patch b/patches/server/0107-Increase-time-statistics-in-intervals.patch similarity index 100% rename from patches/server/0108-Increase-time-statistics-in-intervals.patch rename to patches/server/0107-Increase-time-statistics-in-intervals.patch diff --git a/patches/server/0109-For-collision-check-has-physics-before-same-vehicle.patch b/patches/server/0108-For-collision-check-has-physics-before-same-vehicle.patch similarity index 94% rename from patches/server/0109-For-collision-check-has-physics-before-same-vehicle.patch rename to patches/server/0108-For-collision-check-has-physics-before-same-vehicle.patch index 9e791ed..a43d0c8 100644 --- a/patches/server/0109-For-collision-check-has-physics-before-same-vehicle.patch +++ b/patches/server/0108-For-collision-check-has-physics-before-same-vehicle.patch @@ -16,7 +16,7 @@ As part of: Akarin (https://github.com/Akarin-project/Akarin) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 205319053d1cadeebc2e3475330f220bccef7f6b..85aa260096e4be778deae65340eac5646ff1fe41 100644 +index 840534b87550d86b1d894ddd0916f9cbcaa688aa..6bdcf5866b4ae4165b86268e2c4570e5abfaa26f 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2290,8 +2290,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0110-Skip-negligible-planar-movement-multiplication.patch b/patches/server/0109-Skip-negligible-planar-movement-multiplication.patch similarity index 94% rename from patches/server/0110-Skip-negligible-planar-movement-multiplication.patch rename to patches/server/0109-Skip-negligible-planar-movement-multiplication.patch index 82845a7..199f2db 100644 --- a/patches/server/0110-Skip-negligible-planar-movement-multiplication.patch +++ b/patches/server/0109-Skip-negligible-planar-movement-multiplication.patch @@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) Gale - https://galemc.org diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 85aa260096e4be778deae65340eac5646ff1fe41..f70d8dc85f007cbc990fcf49530ad3f3d192f1ed 100644 +index 6bdcf5866b4ae4165b86268e2c4570e5abfaa26f..d9bd4116bd252e6df3b9c717c469cce0fb2e6fde 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1286,9 +1286,17 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0111-Optimize-matching-item-checks.patch b/patches/server/0110-Optimize-matching-item-checks.patch similarity index 100% rename from patches/server/0111-Optimize-matching-item-checks.patch rename to patches/server/0110-Optimize-matching-item-checks.patch diff --git a/patches/server/0112-Pre-compute-VarLong-sizes.patch b/patches/server/0111-Pre-compute-VarLong-sizes.patch similarity index 100% rename from patches/server/0112-Pre-compute-VarLong-sizes.patch rename to patches/server/0111-Pre-compute-VarLong-sizes.patch diff --git a/patches/server/0113-Optimize-VarInt-write-and-VarLong-write.patch b/patches/server/0112-Optimize-VarInt-write-and-VarLong-write.patch similarity index 100% rename from patches/server/0113-Optimize-VarInt-write-and-VarLong-write.patch rename to patches/server/0112-Optimize-VarInt-write-and-VarLong-write.patch diff --git a/patches/server/0114-Reduce-RandomSource-instances.patch b/patches/server/0113-Reduce-RandomSource-instances.patch similarity index 100% rename from patches/server/0114-Reduce-RandomSource-instances.patch rename to patches/server/0113-Reduce-RandomSource-instances.patch diff --git a/patches/server/0115-Add-xor-shift-random.patch b/patches/server/0114-Add-xor-shift-random.patch similarity index 100% rename from patches/server/0115-Add-xor-shift-random.patch rename to patches/server/0114-Add-xor-shift-random.patch diff --git a/patches/server/0116-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch b/patches/server/0115-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch similarity index 100% rename from patches/server/0116-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch rename to patches/server/0115-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch diff --git a/patches/server/0117-Initialize-line-of-sight-cache-with-low-capacity.patch b/patches/server/0116-Initialize-line-of-sight-cache-with-low-capacity.patch similarity index 100% rename from patches/server/0117-Initialize-line-of-sight-cache-with-low-capacity.patch rename to patches/server/0116-Initialize-line-of-sight-cache-with-low-capacity.patch diff --git a/patches/server/0118-Reduce-line-of-sight-updates-and-cache-lookups.patch b/patches/server/0117-Reduce-line-of-sight-updates-and-cache-lookups.patch similarity index 100% rename from patches/server/0118-Reduce-line-of-sight-updates-and-cache-lookups.patch rename to patches/server/0117-Reduce-line-of-sight-updates-and-cache-lookups.patch diff --git a/patches/server/0119-Server-thread-priority-environment-variable.patch b/patches/server/0118-Server-thread-priority-environment-variable.patch similarity index 100% rename from patches/server/0119-Server-thread-priority-environment-variable.patch rename to patches/server/0118-Server-thread-priority-environment-variable.patch diff --git a/patches/server/0120-Virtual-thread-support.patch b/patches/server/0119-Virtual-thread-support.patch similarity index 100% rename from patches/server/0120-Virtual-thread-support.patch rename to patches/server/0119-Virtual-thread-support.patch