Updated Upstream (Gale)

Winds-Studio · Mar 12, 2024 · 2cd5fdf · 2cd5fdf
1 parent 7f09b03
commit 2cd5fdf
Show file tree

Hide file tree

Showing 43 changed files with 27 additions and 128 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,7 @@
 group = org.dreeam.leaf
 version = 1.20.4-R0.1-SNAPSHOT
 
-galeCommit = 377da10d2e1fdd3d1bbba68813dd1996dcdbfd09
+galeCommit = 8a9cf6a7d5ce651518518f8bd06b1c213a2b0290
 
 org.gradle.caching = true
 org.gradle.parallel = true

diff --git a/patches/server/0010-Purpur-Server-Changes.patch b/patches/server/0010-Purpur-Server-Changes.patch
@@ -2451,7 +2451,7 @@ index 1f9e0c139988c4c44a26552881647d36965aa4fa..b8d612d22aca74a08b53393c0723a2ae
 
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f146fb4a599d36e0a9492936312e609cbbfed641..679209274fbbf8e10498ecec852b0994af2a39e7 100644
+index 6db989e08eb5f77389f0496aaabbca33ee5faa20..6b7025b4cacdc2b14662d09f8da78bce04392d17 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -160,7 +160,7 @@ import org.bukkit.plugin.PluginManager;
@@ -7123,11 +7123,11 @@ index d0c624a6a000c2a41e41d14dd785a7bf9612afe8..bcc49ca8afa9794952883098a586d0e1
 
          }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-index c3f5d82fb3d738ef7c80eae69ba06bd785042380..c7cd4ecf7cec85802c234d72619c9e191d6ca794 100644
+index 52e5f367bf20427a532f59bc20610f05f88982bd..a215c5a42943fcb97448e3ed67467e61efb0d28d 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-@@ -86,6 +86,17 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
-         groundPathNavigation.setCanWalkOverFences(true);
+@@ -88,6 +88,17 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
+         navigation.setCanWalkOverFences(true);
      }
 
 +    // Purpur start
@@ -7144,7 +7144,7 @@ index c3f5d82fb3d738ef7c80eae69ba06bd785042380..c7cd4ecf7cec85802c234d72619c9e19
      @Override
      public void addAdditionalSaveData(CompoundTag nbt) {
          super.addAdditionalSaveData(nbt);
-@@ -309,6 +320,23 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
+@@ -314,6 +325,23 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
          return this.dashCooldown;
      }
 
@@ -8650,7 +8650,7 @@ index eadcebd7845ee716e33c0ac0544502da1a6c5941..8e71d4d3874ff154eae423a8fb8f15ae
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
-index 80303f9466b8c7097151be313afc9a383693d18a..e5b7598a5613a8281a991e42af5b950bcc2995ca 100644
+index c34701f95580e4cf45fe086115563127432a28c5..2363d9eaad655389c7b7d67d545ef8025f550431 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
 @@ -268,7 +268,13 @@ public class ItemFrame extends HangingEntity {
@@ -16939,10 +16939,10 @@ index 927c7ea03560be0c86884cec70ee8e408e66cb07..93764bf849ad8e427bf119f6ff3dbcbc
      public CompoundTag getUpdateTag() {
          return this.saveWithoutMetadata();
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
-index 0d3242be8fe0201e9179a78bd122a2669c42fbc5..f5e9b99459c3e7d28272f0c2499794f9710f57ce 100644
+index 610f1d50b91ffe4b84026681cf65b237bb1d4931..5717b1c2fd5b16d439499296edd35d72b6613212 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
-@@ -179,6 +179,14 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity {
+@@ -172,6 +172,14 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity {
      public static void teleportEntity(Level world, BlockPos pos, BlockState state, Entity entity, TheEndGatewayBlockEntity blockEntity) {
          if (world instanceof ServerLevel && !blockEntity.isCoolingDown()) {
              if (entity.level().galeConfig().gameplayMechanics.fixes.checkCanChangeDimensionsBeforeUseEndGateway && world.galeConfig().gameplayMechanics.fixes.checkCanChangeDimensionsBeforeUseEndGateway && !entity.canChangeDimensions()) return; // Gale - Purpur - end gateway should check if entity can use portal
@@ -17649,7 +17649,7 @@ index c9d276124bd14aafcd1a29991081b7668fe636b6..593119cefb6664f2b0b03b684103440b
      public Collection<GeneratedStructure> getStructures(int x, int z) {
          return this.getStructures(x, z, struct -> true);
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 4ef9e98891a85e4b81f7d3f011bee5ad0eaee4f9..94a998b877e3cfff0477cbef4400ca4113e7681d 100644
+index c35903f48e8201f5f37a2801345a2bc67b6d3d8a..419618b06f2e8b03bea0ee772b4f96cde543a1c6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -195,6 +195,14 @@ public class Main {

diff --git a/...og4j-compatible-with-future-release.patch → ...og4j-compatible-with-future-release.patch b/...og4j-compatible-with-future-release.patch → ...og4j-compatible-with-future-release.patch
diff --git a/patches/server/0035-Leaves-Fix-vehicle-teleport-by-end-gateway.patch b/patches/server/0035-Leaves-Fix-vehicle-teleport-by-end-gateway.patch
diff --git a/...Optimize-villager-data-storage.patc.patch → ...Optimize-villager-data-storage.patc.patch b/...Optimize-villager-data-storage.patc.patch → ...Optimize-villager-data-storage.patc.patch
diff --git a/...Gale-s-Optimize-sun-burn-tick.patch.patch → ...Gale-s-Optimize-sun-burn-tick.patch.patch b/...Gale-s-Optimize-sun-burn-tick.patch.patch → ...Gale-s-Optimize-sun-burn-tick.patch.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Sync with Gale's Optimize-sun-burn-tick.patch
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ffb47d13563f0ff1f557dfe2ed53be7f170f12fa..f9b0c49423ec9a66389f9f0e93e57ef7714cbe08 100644
+index 1952c66202f51bdbca52fab03710ca0d76e0312d..98e673534927255b20f73238f6c213f256ec1694 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -568,13 +568,29 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S

diff --git a/...server/0039-Petal-Async-Pathfinding.patch → ...server/0038-Petal-Async-Pathfinding.patch b/...server/0039-Petal-Async-Pathfinding.patch → ...server/0038-Petal-Async-Pathfinding.patch
diff --git a/...er/0040-Petal-Multithreaded-Tracker.patch → ...er/0039-Petal-Multithreaded-Tracker.patch b/...er/0040-Petal-Multithreaded-Tracker.patch → ...er/0039-Petal-Multithreaded-Tracker.patch
diff --git a/...duce-work-done-by-game-event-system.patch → ...duce-work-done-by-game-event-system.patch b/...duce-work-done-by-game-event-system.patch → ...duce-work-done-by-game-event-system.patch
diff --git a/patches/server/0042-Fix-tracker-NPE.patch → patches/server/0041-Fix-tracker-NPE.patch b/patches/server/0042-Fix-tracker-NPE.patch → patches/server/0041-Fix-tracker-NPE.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix tracker NPE
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index e95f6053982f9637c195243ceab37061b31355b5..af1cd2916a892b4c20ca26187a801ed713325a73 100644
+index 29ea09f27f4b0a7f1ab6075e68c7379898ff2339..80168d2a040c02504af3a4f3f68802afb327046d 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -241,7 +241,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider

diff --git a/...-minecart-vehicle-collision-results.patch → ...-minecart-vehicle-collision-results.patch b/...-minecart-vehicle-collision-results.patch → ...-minecart-vehicle-collision-results.patch
diff --git a/patches/server/0044-Reduce-canSee-work.patch → patches/server/0043-Reduce-canSee-work.patch b/patches/server/0044-Reduce-canSee-work.patch → patches/server/0043-Reduce-canSee-work.patch
diff --git a/...server/0045-Faster-Natural-Spawning.patch → ...server/0044-Faster-Natural-Spawning.patch b/...server/0045-Faster-Natural-Spawning.patch → ...server/0044-Faster-Natural-Spawning.patch
@@ -22,7 +22,7 @@ index ff1ad1024419182f7f3de578442c1c033d4c9ebb..5e51a1c79811291a740ad4d5e79a7d67
      @Deprecated
      static RandomSource createThreadSafe() {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 3c5d8275782df8d9b3fb6e8047bfde02e26ca93f..a4c5bab9d2a714f15d8053e988e6f585377170d3 100644
+index 4c40245756cfbe4ba14069c58d615cea7e2fbf38..720cea58d673a08a161415a2301c0e472eb8792e 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -126,6 +126,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {

diff --git a/...dom-for-xaeroMapServerID-generation.patch → ...dom-for-xaeroMapServerID-generation.patch b/...dom-for-xaeroMapServerID-generation.patch → ...dom-for-xaeroMapServerID-generation.patch
diff --git a/...-Fix-casting-in-Purpur-world-config.patch → ...-Fix-casting-in-Purpur-world-config.patch b/...-Fix-casting-in-Purpur-world-config.patch → ...-Fix-casting-in-Purpur-world-config.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix casting in Purpur world config
 
 
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 42a4684b185ad1c490715b43282a487ea8cd3d3f..8769b5b74ec14ddae8210008b84a9ca82b2aa6f1 100644
+index 7459ca7b724634a191498bf05e345c7e97fbe901..cd73f0e40e5010e3069330ae66120dace63cde56 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -678,7 +678,7 @@ public class PurpurWorldConfig {

diff --git a/patches/server/0048-Fix-sprint-glitch.patch → patches/server/0047-Fix-sprint-glitch.patch b/patches/server/0048-Fix-sprint-glitch.patch → patches/server/0047-Fix-sprint-glitch.patch
diff --git a/...rver/0049-Fix-keepalive-kicked-name.patch → ...rver/0048-Fix-keepalive-kicked-name.patch b/...rver/0049-Fix-keepalive-kicked-name.patch → ...rver/0048-Fix-keepalive-kicked-name.patch
diff --git a/...ble-movement-speed-of-more-entities.patch → ...ble-movement-speed-of-more-entities.patch b/...ble-movement-speed-of-more-entities.patch → ...ble-movement-speed-of-more-entities.patch
diff --git a/...leAppender-NPE-error-on-server-clos.patch → ...leAppender-NPE-error-on-server-clos.patch b/...leAppender-NPE-error-on-server-clos.patch → ...leAppender-NPE-error-on-server-clos.patch
diff --git a/...-of-futures-for-chunk-structure-gen.patch → ...-of-futures-for-chunk-structure-gen.patch b/...-of-futures-for-chunk-structure-gen.patch → ...-of-futures-for-chunk-structure-gen.patch
diff --git a/...e-items-finding-hopper-nearby-check.patch → ...e-items-finding-hopper-nearby-check.patch b/...e-items-finding-hopper-nearby-check.patch → ...e-items-finding-hopper-nearby-check.patch
diff --git a/...nearPurpur-Add-Linear-region-format.patch → ...nearPurpur-Add-Linear-region-format.patch b/...nearPurpur-Add-Linear-region-format.patch → ...nearPurpur-Add-Linear-region-format.patch
diff --git a/...st-remove-all-locks-on-region-files.patch → ...st-remove-all-locks-on-region-files.patch b/...st-remove-all-locks-on-region-files.patch → ...st-remove-all-locks-on-region-files.patch
diff --git a/...issing-purpur-configuration-options.patch → ...issing-purpur-configuration-options.patch b/...issing-purpur-configuration-options.patch → ...issing-purpur-configuration-options.patch
@@ -37,10 +37,10 @@ index eb60d2d99155aae4a761051175fbbddf9ed5dad9..5444213b336bc08eb371673890ded04c
 
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-index c7cd4ecf7cec85802c234d72619c9e191d6ca794..d68368f0d620e3d7a843c149cf06ad96f10662d1 100644
+index a215c5a42943fcb97448e3ed67467e61efb0d28d..7bb25b1a8919abe4b9b65b6b5d54642aa3d7bba3 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-@@ -95,6 +95,18 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
+@@ -97,6 +97,18 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
      public int getPurpurBreedTime() {
          return this.level().purpurConfig.camelBreedingTicks;
      }

diff --git a/...e-missing-Pufferfish-configurations.patch → ...e-missing-Pufferfish-configurations.patch b/...e-missing-Pufferfish-configurations.patch → ...e-missing-Pufferfish-configurations.patch
@@ -10,19 +10,20 @@ Add Pufferfish DAB support for Camel, Sniffer, Warden
 https://github.com/pufferfish-gg/Pufferfish/issues/83
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-index d68368f0d620e3d7a843c149cf06ad96f10662d1..7d671a5a095f8c47ce21bc498046d5065e4dd4ce 100644
+index 7bb25b1a8919abe4b9b65b6b5d54642aa3d7bba3..60dcd2f996dbb4fc4d24489a225f52645c526adb 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-@@ -168,9 +168,11 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
+@@ -170,10 +170,12 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
          return dimensions.height - 0.1F * this.getScale();
      }
 
 +    private int behaviorTick = 0; // Plazma - Add missing pufferfish configurations
      @Override
      protected void customServerAiStep() {
-         Brain<Camel> brain = (Brain<Camel>) this.getBrain(); // Paper - decompile fix
+         Brain<Camel> behaviorcontroller = (Brain<Camel>) this.getBrain(); // CraftBukkit - decompile error
+
 +        if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Plazma - Add missing pufferfish configurations
-         brain.tick((ServerLevel)this.level(), this);
+         behaviorcontroller.tick((ServerLevel) this.level(), this);
          CamelAi.updateActivity(this);
          super.customServerAiStep();
 diff --git a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java

diff --git a/...ver/0058-Skip-event-if-no-listeners.patch → ...ver/0057-Skip-event-if-no-listeners.patch b/...ver/0058-Skip-event-if-no-listeners.patch → ...ver/0057-Skip-event-if-no-listeners.patch
diff --git a/...-Rewrite-framed-map-tracker-ticking.patch → ...-Rewrite-framed-map-tracker-ticking.patch b/...-Rewrite-framed-map-tracker-ticking.patch → ...-Rewrite-framed-map-tracker-ticking.patch
@@ -88,7 +88,7 @@ index 60e8bfc89cfb92e2f7d4860b11c16b3bc5e2f095..b7c7e2727382d06c1ed83bac6e721e48
 
      private void sendDirtyEntityData() {
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
-index e5b7598a5613a8281a991e42af5b950bcc2995ca..c8e2f5676aa121727a981c171b5b98f0ca34b2fa 100644
+index 2363d9eaad655389c7b7d67d545ef8025f550431..b779297432d78a2acd499dd00d9c1601c21a4e08 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
 @@ -489,6 +489,16 @@ public class ItemFrame extends HangingEntity {

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/...e-coordinate-key-used-for-nearby-pl.patch → ...e-coordinate-key-used-for-nearby-pl.patch b/...e-coordinate-key-used-for-nearby-pl.patch → ...e-coordinate-key-used-for-nearby-pl.patch
diff --git a/...SparklyPaper-Optimize-canSee-checks.patch → ...SparklyPaper-Optimize-canSee-checks.patch b/...SparklyPaper-Optimize-canSee-checks.patch → ...SparklyPaper-Optimize-canSee-checks.patch
@@ -16,7 +16,7 @@ This seems stupid, but it does seem that it improves the performance a bit, and
 We also create a "canSee" method tailored for "ChunkMap#updatePlayer()", a method without the equals check (the "updatePlayer()" already checks if the entity is the same entity) because the CraftPlayer's `equals()` check is a *bit* expensive compared to only checking the object's identity, and because the identity has already been check, we don't need to check it twice.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 8fed9395a4c91d25781000478fb83763cae3a50c..fb9f983a0f567e4c722693b120126ace7127800e 100644
+index fdd72e567a1a59153da2adb35a9605b828698535..d6c44f1179688cfee19f9772baaacd22902a91f7 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1420,7 +1420,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -29,7 +29,7 @@ index 8fed9395a4c91d25781000478fb83763cae3a50c..fb9f983a0f567e4c722693b120126ace
                  }
                  // CraftBukkit end
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 2dc391fed96464ccecbd8adbd0795cdf61095aa2..f773936837df65e17f9f7f87ed27660c2be63a6b 100644
+index ad282ad487912c5687916b93be605b21a1ff8f15..80ce7779fc2437444ea16db3d09250f82cef0ed5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -193,7 +193,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

diff --git a/...g-and-snowball-can-knockback-player.patch → ...g-and-snowball-can-knockback-player.patch b/...g-and-snowball-can-knockback-player.patch → ...g-and-snowball-can-knockback-player.patch
diff --git a/...s-method-to-fix-plugin-incompatibil.patch → ...s-method-to-fix-plugin-incompatibil.patch b/...s-method-to-fix-plugin-incompatibil.patch → ...s-method-to-fix-plugin-incompatibil.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Redirect to Gale's method to fix plugin incompatibility
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 8d4fbf7dd77ef5233936aa5c2bce2e63ecbdebab..42885c7f374f619fe63d9fe22a4b7f88d68008c3 100644
+index ca48897b65cf5629fe42f9ea9550bc015a213031..d3a31ca2b926fe809d84cc8b28767c1c69896fe4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -251,6 +251,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

diff --git a/...0065-Configurable-fix-tripwire-dupe.patch → ...0064-Configurable-fix-tripwire-dupe.patch b/...0065-Configurable-fix-tripwire-dupe.patch → ...0064-Configurable-fix-tripwire-dupe.patch
diff --git a/...getProfiler-in-PathNavigationRegion.patch → ...getProfiler-in-PathNavigationRegion.patch b/...getProfiler-in-PathNavigationRegion.patch → ...getProfiler-in-PathNavigationRegion.patch
diff --git a/...-when-attempting-to-locate-a-buried.patch → ...-when-attempting-to-locate-a-buried.patch b/...-when-attempting-to-locate-a-buried.patch → ...-when-attempting-to-locate-a-buried.patch
diff --git a/.../server/0068-Including-5s-in-getTPS.patch → .../server/0067-Including-5s-in-getTPS.patch b/.../server/0068-Including-5s-in-getTPS.patch → .../server/0067-Including-5s-in-getTPS.patch
diff --git a/...eating-stats-json-bases-on-player-n.patch → ...eating-stats-json-bases-on-player-n.patch b/...eating-stats-json-bases-on-player-n.patch → ...eating-stats-json-bases-on-player-n.patch
diff --git a/...0-Fix-NPE-during-creating-GUI-graph.patch → ...9-Fix-NPE-during-creating-GUI-graph.patch b/...0-Fix-NPE-during-creating-GUI-graph.patch → ...9-Fix-NPE-during-creating-GUI-graph.patch
diff --git a/...eption-on-missing-ResourceKey-value.patch → ...eption-on-missing-ResourceKey-value.patch b/...eption-on-missing-ResourceKey-value.patch → ...eption-on-missing-ResourceKey-value.patch
diff --git a/...rver/0072-Improve-Purpur-AFK-system.patch → ...rver/0071-Improve-Purpur-AFK-system.patch b/...rver/0072-Improve-Purpur-AFK-system.patch → ...rver/0071-Improve-Purpur-AFK-system.patch
@@ -42,7 +42,7 @@ index 9950580f3d0387b142576bfdb6a8f74365c12878..9b87e62426f8805247b86eef0fe2939c
              } else {
                  getBukkitEntity().setPlayerListName(prefix + scoreboardName + suffix);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 42885c7f374f619fe63d9fe22a4b7f88d68008c3..66dfd4fc717a47ec2583f51500f4e923403a93d8 100644
+index d3a31ca2b926fe809d84cc8b28767c1c69896fe4..8c35a1a612eaa866f4ce4e23e3c0eaf3ce8f491c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2264,8 +2264,32 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

diff --git a/...-Virtual-Thread-for-async-scheduler.patch → ...-Virtual-Thread-for-async-scheduler.patch b/...-Virtual-Thread-for-async-scheduler.patch → ...-Virtual-Thread-for-async-scheduler.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ability to use Virtual Thread for async scheduler
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index e43203060dfc26387fd5826ffae9e9ca7a01abf2..4826359242158da30b8e14f2cf8f0d309f3dddac 100644
+index ee166ad76bd2c143e04e4bf6bd9991bc90ab99a5..13f3f8628143ffc22a2d2c2129ea4836b0a679d7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -385,7 +385,6 @@ public class Main {

diff --git a/...a-shadow-fork-that-supports-Java-21.patch → ...a-shadow-fork-that-supports-Java-21.patch b/...a-shadow-fork-that-supports-Java-21.patch → ...a-shadow-fork-that-supports-Java-21.patch