Update Paper

gradle.properties

@@ -1,7 +1,7 @@
 group=org.leavesmc.leaves
 version=1.21.1-R0.1-SNAPSHOT
 mcVersion=1.21.1
-paperRef=1798e949e5727f376ccaee51873f21dcdedc9a5f
+paperRef=7c9240f4a63b13be1fdcedbfb0270f9b49b75518
 preVersion=false
 updatingMinecraft=false
 org.gradle.jvmargs=-Xmx2G

patches/server/0020-Optimize-suffocation.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize suffocation
 This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 3fb2b77c519992d5ac863f99a126468fdff9e458..e907b60c0898fb8ef5c79a11e68fe2a29392a5db 100644
+index 15386ed5c4304f85ff3edd9bbf95db9144c28523..0556500fde799583a65a82d00a6b2c65a1757d5e 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -448,7 +448,7 @@ public abstract class LivingEntity extends Entity implements Attackable {

patches/server/0024-Throttle-goal-selector-during-inactive-ticking.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Throttle goal selector during inactive ticking
 This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 7b93c6a04cca2ac31d137f06ef83bb08559b10bf..5c20fad61b81189ad45623346fa2b79ea8aa9b2a 100644
+index bd7c6ce15698aed70376c109ba36f52d6794a2f8..9f2ef5ea9f380e78d4a150df9f16ff6bfc398b75 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -232,11 +232,13 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab

patches/server/0029-Cache-climbing-check-for-activation.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Cache climbing check for activation
 This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 638cd59904499bc4dba7ff68d5676117a654ef86..abf5025cbab6c8f7902bd732ffaca07d1659ca62 100644
+index 0556500fde799583a65a82d00a6b2c65a1757d5e..408700b2236b4e04baebe23b47e72722006e3e23 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2073,6 +2073,22 @@ public abstract class LivingEntity extends Entity implements Attackable {

patches/server/0035-PCA-sync-protocol.patch

@@ -240,7 +240,7 @@ index 431fb6a658c6aac43b6f9dbd1f578b83f261a4e3..138c045dc694c596083bc2f23831ca22
      protected Component getDefaultName() {
          return Component.translatable("container.dispenser");
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
-index 53f9d28bf3c6aafd4fdd6c12e0285500fe7350ce..5b7eedaa4f52ac72da417358034f3f457d6a2b45 100644
+index cab403efd471bb61835224eea4e99570d34dcaaa..f7a6296773defc95215bdf36d8ea105cf9590a9e 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
 @@ -134,6 +134,16 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen

patches/server/0038-Player-operation-limiter.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Player operation limiter
 This patch is Powered by plusls-carpet-addition(https://github.com/plusls/plusls-carpet-addition)
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 40dfc96bbcd1f85a5917c458ae3a8e3c1574c667..b25ce140c29675e16a8ba1caa02bc2318c738734 100644
+index 647a6c9dd39e113625377273281d74ae3f902f96..2852e569c11af9281f5e81659525898bcfea372a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -302,6 +302,10 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple

patches/server/0042-MC-Technical-Survival-Mode.patch

@@ -52,7 +52,7 @@ index 5a97f8a853664a3ced63215a386286873a6c7a95..f10018a3f79744ce0c78ee3020ec0f5d
                  pearl.ownerUUID = null;
              }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index b25ce140c29675e16a8ba1caa02bc2318c738734..850558feb4f54b99755f912fac24f001cc9f88e3 100644
+index 2852e569c11af9281f5e81659525898bcfea372a..55e8802526effaa30fbf7ae5a1b5db7929d668a7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1634,7 +1634,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -91,7 +91,7 @@ index 42bd2d9a1528b6210e4dfb56233062fd97c9743b..8d494b549abb452bb554220060cc9c5b
          this.applyGravity();
          this.move(MoverType.SELF, this.getDeltaMovement());
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-index a01c0d9ae53d1b748c5da914069bd672cb1215c7..f13baecabf3bca1275a8c400741f77557f2c1b19 100644
+index de64de5d1328d3e0826c9990eb7c7eca5088cb9c..52a9d04a7d013283a9de0a6a81c54f28cd41bb5e 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 @@ -126,7 +126,7 @@ public abstract class Projectile extends Entity implements TraceableEntity {
@@ -117,7 +117,7 @@ index 8205d34ed80781b2aab1fb2ef59986b9370f0198..c5b26fdb173a59280e790a5d5a687e0c
                          entity.spawnReason == org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.CHUNK_GEN)) {
                      continue;
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
-index b6a419ab08a8ee1ddffa234ddc07027ce5296ca8..23f77efe1a0a6ff6398308ce133be762da2a6d0c 100644
+index 5f394cda052271b6ecfafc325733e5ae0524822f..cee74a6c47cd56a17a8faf68405fee09d6fd4655 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
 @@ -295,7 +295,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen

patches/server/0043-Return-nether-portal-fix.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Return nether portal fix
 This patch is powered by NetherPortalFix(https://github.com/TwelveIterationMods/NetherPortalFix)
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 850558feb4f54b99755f912fac24f001cc9f88e3..212c4bc00081348b2768c35e7d6350f955f68e59 100644
+index 55e8802526effaa30fbf7ae5a1b5db7929d668a7..cc51a2c43028e63fa4bcf6dadb7b5bc3d5a9f4bb 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1437,6 +1437,21 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -61,7 +61,7 @@ index f5ea34249bde9ecc19fad0b1fda4f9775522c7a6..d2c98e0f8d2dfbc74180a82bdb53741c
  
          // Save player file again if they were disconnected
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index b531a0699f1ccbafbb26907edddd7ab8adce1718..efbac4dd85314cce550d4c8fa1836566012a7a0d 100644
+index 408700b2236b4e04baebe23b47e72722006e3e23..31504985a81b48dab5d999310019dbdb191eb2d5 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -260,7 +260,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -74,7 +74,7 @@ index b531a0699f1ccbafbb26907edddd7ab8adce1718..efbac4dd85314cce550d4c8fa1836566
      @Nullable
      private DamageSource lastDamageSource;
 diff --git a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
-index ddab7de1d376e9e486e2f920174397ea8804aa29..73b6e6f24852370268bdcb0b06027daa119b5091 100644
+index 1722188fbfccd233625db540ddcaf646762fd023..08892ab4eb097abf1fce4a75613b49ce376a0a23 100644
 --- a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
 @@ -172,7 +172,18 @@ public class NetherPortalBlock extends Block implements Portal {

patches/server/0047-Use-vanilla-random-config.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Use vanilla random config
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a95fd8164ddd2992525e1f453df2094ed2108cf7..ed5a96f4a4693cdbd081664fc7cc0774adf0319e 100644
+index 1beefbd05c13181214e188f50e88fb67f6712a45..012c638335ac54ffe1f780d2cd1e3a50243e33e9 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -558,7 +558,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -44,7 +44,7 @@ index 42f4e544fe7fbc342f15eacb5e38d40849e3c419..0bd9ee3d0b546564a069f4aaf7a33e35
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index a2b9e996fa606d91b153979eefae8974f7ffdf4e..9b8991e562e83c0e3a29f868fa19690e4aa2d453 100644
+index 929a9bee808e8216dacb74dc58dbeee612126afe..9205d565f375a8177c6bc0c19e1f594d1d8cd0ed 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -79,7 +79,13 @@ public class ItemEntity extends Entity implements TraceableEntity {

patches/server/0063-Elytra-aeronautics-no-chunk-load.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Elytra aeronautics no chunk load
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index d9c36827706776e143fccd72b53c12a9ac455475..59c023076a7a64049ba478aa049f19103aeb70ee 100644
+index 5fe7ae8b873f71a0caf886e6036a4f58c835c4c2..0905615b8961793d57e5a3009e653f7af46e2007 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -749,7 +749,8 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -27,7 +27,7 @@ index d9c36827706776e143fccd72b53c12a9ac455475..59c023076a7a64049ba478aa049f1910
  
          SectionPos sectionposition = player.getLastSectionPos();
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 32d8d22f5e08f6ebdd06b5057fe1b0451acdf1f2..6556fc94295d66eec90492c051053bf24cc8ebd4 100644
+index f893f841509017d61b496e712c12b578d4d69345..e3b150807c04a487b9165f71ba9923e17568ba61 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -559,7 +559,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -40,7 +40,7 @@ index 32d8d22f5e08f6ebdd06b5057fe1b0451acdf1f2..6556fc94295d66eec90492c051053bf2
                          !worldserver.areChunksLoadedForMove(entity.getBoundingBox().expandTowards(new Vec3(toX, toY, toZ).subtract(entity.position())))
                      )) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 0f084a9906bd8b20f7b10e47647bfb1b6f7ef710..d6b90cc6e94d3e81a336cf15910a0c89e69fa96b 100644
+index 012c638335ac54ffe1f780d2cd1e3a50243e33e9..5a882339c89e55f29369ee013babf89afc5194ce 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1136,7 +1136,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

patches/server/0064-Cache-ignite-odds.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Cache ignite odds
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/FireBlock.java b/src/main/java/net/minecraft/world/level/block/FireBlock.java
-index 4d467ecf0dd8006b9fa4fb8fb5aadc0622a1e512..2a60644479cdc31cd08beff154864b6c39538649 100644
+index 0a77a470d78f68e8397f29f298e7f52fbd7ba9a2..3f82dd92c41519bd21b481f2303f03a12bb8f973 100644
 --- a/src/main/java/net/minecraft/world/level/block/FireBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/FireBlock.java
 @@ -220,6 +220,7 @@ public class FireBlock extends BaseFireBlock {

patches/server/0080-Reduce-array-allocations.patch

@@ -218,7 +218,7 @@ index 0846e11c82295ccf93683f877962ec7804dad677..b747b3858befe48996ea707cf126f6f8
  
              for (int j = 0; j < i; ++j) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index b79d34a8cfbe562e53960062d8dd9e9e5156a9ed..1b33ac2eaa4d938f8e930fb2bfcc7169f10f851f 100644
+index 542531451c63392262fa81ec62ff7143e455e04c..64b63fe65f12d21e589c946c76e54f8f9fc8aeef 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -181,6 +181,7 @@ import org.bukkit.event.server.MapInitializeEvent;
@@ -230,7 +230,7 @@ index b79d34a8cfbe562e53960062d8dd9e9e5156a9ed..1b33ac2eaa4d938f8e930fb2bfcc7169
  public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.moonrise.patches.chunk_system.level.ChunkSystemServerLevel, ca.spottedleaf.moonrise.patches.chunk_system.level.ChunkSystemLevelReader { // Paper - rewrite chunk system
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6556fc94295d66eec90492c051053bf24cc8ebd4..ec131f0041f9a2167f06a5fc85c2fd01f6062531 100644
+index e3b150807c04a487b9165f71ba9923e17568ba61..bfaec4b4dbe74b09e4c4e56268e38ce475304796 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -249,6 +249,7 @@ import org.bukkit.inventory.EquipmentSlot;
@@ -357,7 +357,7 @@ index 2fa2a4eef21e786f738f36616c3160defa95bce8..36c98f611f043ebadffd1b110ba3002b
      private EquipmentSlot(final EquipmentSlot.Type type, final int entityId, final int maxCount, final int armorStandId, final String name) {
          this.type = type;
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index efbac4dd85314cce550d4c8fa1836566012a7a0d..a160a6b3a8634d142436ba4098da219cf4d825a8 100644
+index 31504985a81b48dab5d999310019dbdb191eb2d5..af8f8161b940afb1b77dee7cc2711e42738a6bed 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3280,7 +3280,7 @@ public abstract class LivingEntity extends Entity implements Attackable {

patches/server/0081-Optimize-sun-burn-tick.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize sun burn tick
 This patch is Powered by Gale(https://github.com/GaleMC/Gale)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index d6b90cc6e94d3e81a336cf15910a0c89e69fa96b..34610ab46a46a654742132ee35d3ec180d97d2ab 100644
+index 5a882339c89e55f29369ee013babf89afc5194ce..e5ead8e57e8c527e0906816b741db20b346880d1 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2078,8 +2078,22 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

patches/server/0085-Check-frozen-ticks-before-landing-block.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Check frozen ticks before landing block
 This patch is Powered by Gale(https://github.com/GaleMC/Gale)
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index a160a6b3a8634d142436ba4098da219cf4d825a8..fc6bbe34b6ff4912d34f86196c6d55d7116dcedb 100644
+index af8f8161b940afb1b77dee7cc2711e42738a6bed..c578497c824021e571b21b1b938705e7f585632c 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -564,11 +564,11 @@ public abstract class LivingEntity extends Entity implements Attackable {

patches/server/0086-Skip-entity-move-if-movement-is-zero.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Skip entity move if movement is zero
 This patch is Powered by Gale(https://github.com/GaleMC/Gale)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 381d145c3fd843c5ed0193fb704921f1ffd628ec..f6e23891418232a962c2ed0f25105a62c16e57b8 100644
+index e5ead8e57e8c527e0906816b741db20b346880d1..c19bd6fbf050f7552acd80fa0381a5b2a89dd433 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -323,6 +323,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

patches/server/0088-Skip-negligible-planar-movement-multiplication.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Skip negligible planar movement multiplication
 This patch is Powered by Gale(https://github.com/GaleMC/Gale)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 85afcaaa2fee449139e68cdc346738403edc0fdd..582d7221b8af8d96909cf240913168fc09c966c4 100644
+index c19bd6fbf050f7552acd80fa0381a5b2a89dd433..22f1ccd7f0055cc6d68803111666e2df59a54aa4 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1285,9 +1285,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

patches/server/0090-Avoid-anvil-too-expensive.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Avoid anvil too expensive
 
 
 diff --git a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
-index 7198dc9ffc9a37dab3654e12aa497c442a9993c5..f81870bf7fb81d3c409971a35e5782c898ab547b 100644
+index d685511104ac552dfc9ae2111e1bfb60fa812102..f80e09d3105405ecc3c877d389633583e94690f1 100644
 --- a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
 @@ -280,7 +280,7 @@ public class AnvilMenu extends ItemCombinerMenu {

patches/server/0095-Replay-Mod-API.patch

@@ -437,7 +437,7 @@ index 9c3df47ae65289c27a1d63ac06ca41c074ff374e..01d902e9fbf029fcd8aa21e541e54785
          // Special case complex part, since there is no extra entity type for them
          if (entity instanceof EnderDragonPart complexPart) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 992437a6e838f653f32d33b5b3f702c484640a97..cc2bd9fd33070464bac8aeab9ff26543e7b57801 100644
+index a0d5082590ee03060f0dbb4770d196efc316c328..d85413bb9b6b7e60de97d084d27a457409ee4ddc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2243,7 +2243,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

patches/server/0102-Force-Void-Trade.patch

@@ -119,7 +119,7 @@ index 0af34e0f9c9696fbcb11b12fb27472ef17ad532a..422d537014520383503f06e834ef6fb3
              return InteractionResult.sidedSuccess(this.level().isClientSide);
          } else {
 diff --git a/src/main/java/net/minecraft/world/inventory/MerchantMenu.java b/src/main/java/net/minecraft/world/inventory/MerchantMenu.java
-index 2992e86f5f83431e230162380b33721df785ba91..7ec2ef906433d7e0164ce0e5ec62fef602ba6b37 100644
+index 5de2030452b96a4df7ce0be82f07e002db595dee..7c2b12fcc8028fc029af17e3bae2901843b47b62 100644
 --- a/src/main/java/net/minecraft/world/inventory/MerchantMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/MerchantMenu.java
 @@ -27,7 +27,7 @@ public class MerchantMenu extends AbstractContainerMenu {

patches/server/0108-Make-Item-tick-vanilla.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Make Item tick vanilla
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index 9b8991e562e83c0e3a29f868fa19690e4aa2d453..75001a1161a5c6dabd84c688424deadb87d3da67 100644
+index 9205d565f375a8177c6bc0c19e1f594d1d8cd0ed..1412cf425fb346e2b155f494d0867f1a06e1b3a1 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -252,6 +252,9 @@ public class ItemEntity extends Entity implements TraceableEntity {

patches/server/0113-Servux-Protocol.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Servux Protocol
 
 
 diff --git a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/player/RegionizedPlayerChunkLoader.java b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/player/RegionizedPlayerChunkLoader.java
-index ab18bbf87dfc1455ed185a5152dad6d236565ecc..227c89f7d58cdcfad762f1f11e1f87203a444c6f 100644
+index a608f57ebca98eda88ad749d0aad021678be54f9..aea042e67daeacfb34bbb770bb267ef29921c517 100644
 --- a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/player/RegionizedPlayerChunkLoader.java
 +++ b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/player/RegionizedPlayerChunkLoader.java
 @@ -412,7 +412,11 @@ public final class RegionizedPlayerChunkLoader {