Removed Load portal destination chunk before entity teleport

Dreeam-qwq · Dec 12, 2024 · 480824b · 480824b
1 parent 7c299c7
commit 480824b
Show file tree

Hide file tree

Showing 28 changed files with 12 additions and 9 deletions.
diff --git a/...nation-chunk-before-entity-teleport.patch → ...nation-chunk-before-entity-teleport.patch b/...nation-chunk-before-entity-teleport.patch → ...nation-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/...Don-t-load-chunks-to-spawn-phantoms.patch → ...Don-t-load-chunks-to-spawn-phantoms.patch b/...Don-t-load-chunks-to-spawn-phantoms.patch → ...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/...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
@@ -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/...imations-as-the-entity-being-critte.patch → ...imations-as-the-entity-being-critte.patch b/...imations-as-the-entity-being-critte.patch → ...imations-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/...7-Ignore-null-legacy-structure-data.patch → ...6-Ignore-null-legacy-structure-data.patch b/...7-Ignore-null-legacy-structure-data.patch → ...6-Ignore-null-legacy-structure-data.patch
diff --git a/...necessary-mob-spawning-computations.patch → ...necessary-mob-spawning-computations.patch b/...necessary-mob-spawning-computations.patch → ...necessary-mob-spawning-computations.patch
diff --git a/...random-strolling-into-non-ticking-c.patch → ...random-strolling-into-non-ticking-c.patch b/...random-strolling-into-non-ticking-c.patch → ...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/...er-in-world-if-kicked-before-being-.patch → ...er-in-world-if-kicked-before-being-.patch b/...er-in-world-if-kicked-before-being-.patch → ...er-in-world-if-kicked-before-being-.patch
diff --git a/.../0101-CraftBukkit-UUID-to-world-map.patch → .../0100-CraftBukkit-UUID-to-world-map.patch b/.../0101-CraftBukkit-UUID-to-world-map.patch → .../0100-CraftBukkit-UUID-to-world-map.patch
diff --git a/patches/server/0102-Global-EULA-file.patch → patches/server/0101-Global-EULA-file.patch b/patches/server/0102-Global-EULA-file.patch → patches/server/0101-Global-EULA-file.patch
diff --git a/...rver/0103-Specific-interval-TPS-API.patch → ...rver/0102-Specific-interval-TPS-API.patch b/...rver/0103-Specific-interval-TPS-API.patch → ...rver/0102-Specific-interval-TPS-API.patch
diff --git a/...es/server/0104-5-second-TPS-average.patch → ...es/server/0103-5-second-TPS-average.patch b/...es/server/0104-5-second-TPS-average.patch → ...es/server/0103-5-second-TPS-average.patch
diff --git a/.../server/0105-Measure-last-tick-time.patch → .../server/0104-Measure-last-tick-time.patch b/.../server/0105-Measure-last-tick-time.patch → .../server/0104-Measure-last-tick-time.patch
diff --git a/patches/server/0106-Last-tick-time-API.patch → patches/server/0105-Last-tick-time-API.patch b/patches/server/0106-Last-tick-time-API.patch → patches/server/0105-Last-tick-time-API.patch
diff --git a/...-Show-last-tick-time-in-tps-command.patch → ...-Show-last-tick-time-in-tps-command.patch b/...-Show-last-tick-time-in-tps-command.patch → ...-Show-last-tick-time-in-tps-command.patch
diff --git a/...crease-time-statistics-in-intervals.patch → ...crease-time-statistics-in-intervals.patch b/...crease-time-statistics-in-intervals.patch → ...crease-time-statistics-in-intervals.patch
diff --git a/...eck-has-physics-before-same-vehicle.patch → ...eck-has-physics-before-same-vehicle.patch b/...eck-has-physics-before-same-vehicle.patch → ...eck-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/...ible-planar-movement-multiplication.patch → ...ible-planar-movement-multiplication.patch b/...ible-planar-movement-multiplication.patch → ...ible-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/.../0111-Optimize-matching-item-checks.patch → .../0110-Optimize-matching-item-checks.patch b/.../0111-Optimize-matching-item-checks.patch → .../0110-Optimize-matching-item-checks.patch
diff --git a/...rver/0112-Pre-compute-VarLong-sizes.patch → ...rver/0111-Pre-compute-VarLong-sizes.patch b/...rver/0112-Pre-compute-VarLong-sizes.patch → ...rver/0111-Pre-compute-VarLong-sizes.patch
diff --git a/...mize-VarInt-write-and-VarLong-write.patch → ...mize-VarInt-write-and-VarLong-write.patch b/...mize-VarInt-write-and-VarLong-write.patch → ...mize-VarInt-write-and-VarLong-write.patch
diff --git a/.../0114-Reduce-RandomSource-instances.patch → .../0113-Reduce-RandomSource-instances.patch b/.../0114-Reduce-RandomSource-instances.patch → .../0113-Reduce-RandomSource-instances.patch
diff --git a/...es/server/0115-Add-xor-shift-random.patch → ...es/server/0114-Add-xor-shift-random.patch b/...es/server/0115-Add-xor-shift-random.patch → ...es/server/0114-Add-xor-shift-random.patch
diff --git a/...Stack-lookups-for-reduced-visibilit.patch → ...Stack-lookups-for-reduced-visibilit.patch b/...Stack-lookups-for-reduced-visibilit.patch → ...Stack-lookups-for-reduced-visibilit.patch
diff --git a/...ne-of-sight-cache-with-low-capacity.patch → ...ne-of-sight-cache-with-low-capacity.patch b/...ne-of-sight-cache-with-low-capacity.patch → ...ne-of-sight-cache-with-low-capacity.patch
diff --git a/...-of-sight-updates-and-cache-lookups.patch → ...-of-sight-updates-and-cache-lookups.patch b/...-of-sight-updates-and-cache-lookups.patch → ...-of-sight-updates-and-cache-lookups.patch
diff --git a/...hread-priority-environment-variable.patch → ...hread-priority-environment-variable.patch b/...hread-priority-environment-variable.patch → ...hread-priority-environment-variable.patch
diff --git a/.../server/0120-Virtual-thread-support.patch → .../server/0119-Virtual-thread-support.patch b/.../server/0120-Virtual-thread-support.patch → .../server/0119-Virtual-thread-support.patch