Update Paper

gradle.properties

@@ -1,7 +1,7 @@
 group=org.leavesmc.leaves
 version=1.21.4-R0.1-SNAPSHOT
 mcVersion=1.21.4
-paperRef=ce3001621894ea775206abe455442d0aeeef3535
+paperRef=6ea42025a49f232f47861c6ca943b0fc66b7effe
 preVersion=true
 org.gradle.jvmargs=-Xmx2G
 org.gradle.caching=true

leaves-server/minecraft-patches/features/0004-Fix-trading-with-the-void.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix trading with the void
 
 
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index e6733c43d582c1c632ad0e6abc99e88e337c8911..ab826bb0da27116fec14179053b2aef7faddca1f 100644
+index d3c50acc5ca30b608825d4baff4b7e09a9e0f586..60425aade859c03ec21669b33d6b5096e444f6e9 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
-@@ -2677,11 +2677,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -2678,11 +2678,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
              // Spigot end
              // Spigot start
              if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message

leaves-server/minecraft-patches/features/0006-Leaves-Fakeplayer.patch

@@ -17,7 +17,7 @@ index 4b2ae046413146b11912e7aa4a9a3d643de6afd1..c5733fe17b4dd5dfe4bce461a305a13a
          Set<CriterionTrigger.Listener<T>> set = (Set) advancements.criterionData.get(this); // Paper - fix PlayerAdvancements leak
          if (set != null && !set.isEmpty()) {
 diff --git a/net/minecraft/network/Connection.java b/net/minecraft/network/Connection.java
-index e1000d8ab5ae0034b56a3524d2caee8c299b50e7..f8a67220ebb72fd446006b7aaed87fc69bd0454d 100644
+index 4ed9611994c5c8da01fede690197527c5b3a5731..364ddf9f25ef3cb97ba788c469fee9dd495b84a7 100644
 --- a/net/minecraft/network/Connection.java
 +++ b/net/minecraft/network/Connection.java
 @@ -96,7 +96,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
@@ -101,7 +101,7 @@ index 64dbee1f67eaa17c93c13bfa38fbe27de57651e4..459e59c370a729dfeed3872f3a5984dd
          AdvancementProgress orStartProgress = this.getOrStartProgress(advancement);
          boolean isDone = orStartProgress.isDone();
 diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java
-index 64708df57aeca5c1f656748da96c6dadfba67ed7..0c4e5aa382fed846a35badf903cab2756621a678 100644
+index 5eb12553eb96db7204ee45a2ab4ed18e2e048573..529a2caa2cde82bfdea7c173768fee32f5f21e49 100644
 --- a/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -203,6 +203,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -131,7 +131,7 @@ index b3f498558614243cf633dcd71e3c49c2c55e6e0f..36c0a690e7e9b301c5a3d63fae2c7cbe
              }
          }
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index ab826bb0da27116fec14179053b2aef7faddca1f..2793045ca4ffa91441dc9346bd3c497699617d02 100644
+index 60425aade859c03ec21669b33d6b5096e444f6e9..9fba04e8a8e95546f7d7cc1210b4b324c86d2b87 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
 @@ -215,6 +215,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
@@ -163,7 +163,7 @@ index ab826bb0da27116fec14179053b2aef7faddca1f..2793045ca4ffa91441dc9346bd3c4976
      @Override
      public void onBlockStateChange(BlockPos pos, BlockState blockState, BlockState newState) {
          Optional<Holder<PoiType>> optional = PoiTypes.forState(blockState);
-@@ -2620,6 +2628,11 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -2621,6 +2629,11 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
              // ServerLevel.this.getChunkSource().addEntity(entity); // Paper - ignore and warn about illegal addEntity calls instead of crashing server; moved down below valid=true
              if (entity instanceof ServerPlayer serverPlayer) {
                  ServerLevel.this.players.add(serverPlayer);
@@ -175,7 +175,7 @@ index ab826bb0da27116fec14179053b2aef7faddca1f..2793045ca4ffa91441dc9346bd3c4976
                  ServerLevel.this.updateSleepingPlayerList();
              }
  
-@@ -2686,6 +2699,11 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -2687,6 +2700,11 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
              ServerLevel.this.getChunkSource().removeEntity(entity);
              if (entity instanceof ServerPlayer serverPlayer) {
                  ServerLevel.this.players.remove(serverPlayer);
@@ -188,7 +188,7 @@ index ab826bb0da27116fec14179053b2aef7faddca1f..2793045ca4ffa91441dc9346bd3c4976
              }
  
 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index 57d432dc9e8d8e9a3e088e7c40b35178c30fe786..f8b80a6a9d98f69dcbb84629607ee55c8191b55f 100644
+index 3de65c4025be91d938a350c884975cb6edc234d3..d0adf5df51dc47b1569e1ee2c307fe62933e145f 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
 @@ -197,7 +197,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
@@ -200,7 +200,7 @@ index 57d432dc9e8d8e9a3e088e7c40b35178c30fe786..f8b80a6a9d98f69dcbb84629607ee55c
      private final PlayerAdvancements advancements;
      private final ServerStatsCounter stats;
      private float lastRecordedHealthAndAbsorption = Float.MIN_VALUE;
-@@ -804,16 +804,20 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+@@ -811,16 +811,20 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
              this.invulnerableTime--;
          }
  
@@ -230,7 +230,7 @@ index 57d432dc9e8d8e9a3e088e7c40b35178c30fe786..f8b80a6a9d98f69dcbb84629607ee55c
  
          Entity camera = this.getCamera();
          if (camera != this) {
-@@ -828,7 +832,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+@@ -835,7 +839,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
              }
          }
  
@@ -239,7 +239,7 @@ index 57d432dc9e8d8e9a3e088e7c40b35178c30fe786..f8b80a6a9d98f69dcbb84629607ee55c
          if (this.levitationStartPos != null) {
              CriteriaTriggers.LEVITATION.trigger(this, this.levitationStartPos, this.tickCount - this.levitationStartTime);
          }
-@@ -1462,6 +1466,11 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+@@ -1469,6 +1473,11 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
                  this.lastSentHealth = -1.0F;
                  this.lastSentFood = -1;
  
@@ -252,7 +252,7 @@ index 57d432dc9e8d8e9a3e088e7c40b35178c30fe786..f8b80a6a9d98f69dcbb84629607ee55c
                  // CraftBukkit start
                  org.bukkit.event.player.PlayerChangedWorldEvent changeEvent = new org.bukkit.event.player.PlayerChangedWorldEvent(this.getBukkitEntity(), serverLevel.getWorld());
 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index 99e82b35800ef5c1ed24967fe9194aa35d3e2f24..f7db21ff9ce35f4a3b80e1e36366a1878605931b 100644
+index f88b3b3d0f8e56f17de491fa9d312dadad364a42..bd7ae7aba1802f202ea09cb1064832092da30c4b 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
 @@ -332,6 +332,19 @@ public abstract class PlayerList {
@@ -322,7 +322,7 @@ index 99e82b35800ef5c1ed24967fe9194aa35d3e2f24..f7db21ff9ce35f4a3b80e1e36366a187
      }
  
      public void broadcast(@Nullable Player except, double x, double y, double z, double radius, ResourceKey<Level> dimension, Packet<?> packet) {
-@@ -1356,7 +1387,13 @@ public abstract class PlayerList {
+@@ -1361,7 +1392,13 @@ public abstract class PlayerList {
  
      @Nullable
      public ServerPlayer getPlayer(UUID playerUUID) {
@@ -338,7 +338,7 @@ index 99e82b35800ef5c1ed24967fe9194aa35d3e2f24..f7db21ff9ce35f4a3b80e1e36366a187
  
      public boolean canBypassPlayerLimit(GameProfile profile) {
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 7f2f95a7dc4a7dc4340159dabb0743b101d55f3d..f0186607153bb1c498833f269eec041cb7db1e11 100644
+index e6bbcfed42233a31b72533c1f45b88b401b273a3..c599b8196d0eb72290081a533e5651448269d8ca 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -1432,7 +1432,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -399,10 +399,10 @@ index 1e012c7ef699a64ff3f1b00f897bb893ab25ecbd..f2bf0cdbd29438ca51b74ae2fcdf49db
      public int timeUntilHooked;
      public float fishAngle;
 diff --git a/net/minecraft/world/inventory/AbstractContainerMenu.java b/net/minecraft/world/inventory/AbstractContainerMenu.java
-index 50af953a4698a3c6e16b840fab764dd733b3fbc9..b7285c67ce3f6db2fa23a6dc91fcfa6a3d19f9b4 100644
+index acca8c51d2030c675c157b10d0bbc6af631afe61..b4721c4e81cc2ae989765d86bd51ebf0be41758c 100644
 --- a/net/minecraft/world/inventory/AbstractContainerMenu.java
 +++ b/net/minecraft/world/inventory/AbstractContainerMenu.java
-@@ -365,6 +365,7 @@ public abstract class AbstractContainerMenu {
+@@ -375,6 +375,7 @@ public abstract class AbstractContainerMenu {
  
      private void doClick(int slotId, int button, ClickType clickType, Player player) {
          Inventory inventory = player.getInventory();
@@ -410,7 +410,7 @@ index 50af953a4698a3c6e16b840fab764dd733b3fbc9..b7285c67ce3f6db2fa23a6dc91fcfa6a
          if (clickType == ClickType.QUICK_CRAFT) {
              int i = this.quickcraftStatus;
              this.quickcraftStatus = getQuickcraftHeader(button);
-@@ -641,6 +642,22 @@ public abstract class AbstractContainerMenu {
+@@ -651,6 +652,22 @@ public abstract class AbstractContainerMenu {
          }
      }
  

leaves-server/minecraft-patches/features/0014-No-chat-sign.patch

@@ -133,10 +133,10 @@ index 46ffae71b5119c7c4527a21b19c8e822f4d87114..d3962942cfaf93e8a8f169f243a2cb3c
          if (packet == null || this.processedDisconnect) { // Spigot
              return;
 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index f7db21ff9ce35f4a3b80e1e36366a1878605931b..787395860a7b5b8006725d8d8ebede5b72b01a22 100644
+index bd7ae7aba1802f202ea09cb1064832092da30c4b..43759c08630fce13199cc3dda1841c52088b615e 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
-@@ -1315,7 +1315,7 @@ public abstract class PlayerList {
+@@ -1320,7 +1320,7 @@ public abstract class PlayerList {
      }
  
      public boolean verifyChatTrusted(PlayerChatMessage message) { // Paper - private -> public

leaves-server/minecraft-patches/features/0026-BBOR-Protocol.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] BBOR Protocol
 
 
 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index 07a2dad0480d030fe198785fab2faa6108a38214..7628d226960414f9d90d24dd2a9614d6c7e8ebca 100644
+index 43759c08630fce13199cc3dda1841c52088b615e..a79f83991aa50d45695beeeb018f203c6d7ae6d8 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
-@@ -1438,6 +1438,7 @@ public abstract class PlayerList {
+@@ -1443,6 +1443,7 @@ public abstract class PlayerList {
              serverPlayer.connection.send(clientboundUpdateRecipesPacket);
              serverPlayer.getRecipeBook().sendInitialRecipeBook(serverPlayer);
          }

leaves-server/minecraft-patches/features/0030-Player-operation-limiter.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Player operation limiter
 This patch is Powered by plusls-carpet-addition(https://github.com/plusls/plusls-carpet-addition)
 
 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index c9e7f3cfe5aff88424ced502be18e7bb0c20240f..68c934aec165690979f066eee73d4b2bc803ed14 100644
+index d0adf5df51dc47b1569e1ee2c307fe62933e145f..f68ef6c8209b0bfa288800ac8bd42e1673bb4077 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
-@@ -393,6 +393,10 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+@@ -400,6 +400,10 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
      public com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper - PlayerNaturallySpawnCreaturesEvent
      public @Nullable String clientBrandName = null; // Paper - Brand support
      public org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - Add API for quit reason; there are a lot of changes to do if we change all methods leading to the event
@@ -20,7 +20,7 @@ index c9e7f3cfe5aff88424ced502be18e7bb0c20240f..68c934aec165690979f066eee73d4b2b
  
      // Paper start - rewrite chunk system
      private ca.spottedleaf.moonrise.patches.chunk_system.player.RegionizedPlayerChunkLoader.PlayerChunkLoaderData chunkLoader;
-@@ -798,6 +802,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+@@ -805,6 +809,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
          }
          // CraftBukkit end
          this.tickClientLoadTimeout();
@@ -28,7 +28,7 @@ index c9e7f3cfe5aff88424ced502be18e7bb0c20240f..68c934aec165690979f066eee73d4b2b
          this.gameMode.tick();
          this.wardenSpawnTracker.tick();
          if (this.invulnerableTime > 0) {
-@@ -3087,4 +3092,31 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+@@ -3094,4 +3099,31 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
          return (org.bukkit.craftbukkit.entity.CraftPlayer) super.getBukkitEntity();
      }
      // CraftBukkit end

leaves-server/minecraft-patches/features/0032-Stackable-ShulkerBoxes.patch

@@ -32,10 +32,10 @@ index c1130f596cf3443eeb62eb1b12587172fe0859ee..ad51ad9f104f8f7238298b025e2d7485
  
      private ClientboundContainerSetSlotPacket(RegistryFriendlyByteBuf buffer) {
 diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 882dbb1276c548316938bbc50f5f7e01f8547ff8..9955fc7bcf75dbe86c5fcbace2dd1f2ccf479207 100644
+index b4a284a0617167fd12e9d9414b17f86c169ba563..771abbc4aeea227b99b069d9d6f58a6b8df4ee5d 100644
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3380,7 +3380,7 @@ public class ServerGamePacketListenerImpl
+@@ -3393,7 +3393,7 @@ public class ServerGamePacketListenerImpl
              }
  
              boolean flag1 = packet.slotNum() >= 1 && packet.slotNum() <= 45;
@@ -210,10 +210,10 @@ index c18aea2bb5ddddadbc858b253ff4c08d82178a18..6a24b442a21298ef3bdbcb76de9bdcf0
  
      default SlotAccess getChestVehicleSlot(final int index) {
 diff --git a/net/minecraft/world/inventory/AbstractContainerMenu.java b/net/minecraft/world/inventory/AbstractContainerMenu.java
-index b7285c67ce3f6db2fa23a6dc91fcfa6a3d19f9b4..bca4a8528ec362471797c2d962cd3c903cae89f2 100644
+index b4721c4e81cc2ae989765d86bd51ebf0be41758c..f5a6d01037235b120e13cde9134e5ac0fc2d2c00 100644
 --- a/net/minecraft/world/inventory/AbstractContainerMenu.java
 +++ b/net/minecraft/world/inventory/AbstractContainerMenu.java
-@@ -417,7 +417,7 @@ public abstract class AbstractContainerMenu {
+@@ -427,7 +427,7 @@ public abstract class AbstractContainerMenu {
                              && (this.quickcraftType == 2 || carried1.getCount() >= this.quickcraftSlots.size())
                              && this.canDragTo(slot1)) {
                              int i2 = slot1.hasItem() ? slot1.getItem().getCount() : 0;
@@ -222,7 +222,7 @@ index b7285c67ce3f6db2fa23a6dc91fcfa6a3d19f9b4..bca4a8528ec362471797c2d962cd3c90
                              int min1 = Math.min(getQuickCraftPlaceCount(this.quickcraftSlots, this.quickcraftType, itemStack) + i2, min);
                              count -= min1 - i2;
                              // slot1.setByPlayer(itemStack.copyWithCount(min1));
-@@ -531,7 +531,7 @@ public abstract class AbstractContainerMenu {
+@@ -541,7 +541,7 @@ public abstract class AbstractContainerMenu {
                                  slot.setByPlayer(carried2);
                              }
                          } else if (ItemStack.isSameItemSameComponents(carried, carried2)) {
@@ -231,7 +231,7 @@ index b7285c67ce3f6db2fa23a6dc91fcfa6a3d19f9b4..bca4a8528ec362471797c2d962cd3c90
                              optional1.ifPresent(stack -> {
                                  carried2.grow(stack.getCount());
                                  slot.onTake(player, stack);
-@@ -593,7 +593,7 @@ public abstract class AbstractContainerMenu {
+@@ -603,7 +603,7 @@ public abstract class AbstractContainerMenu {
              Slot slot2 = this.slots.get(slotId);
              if (slot2.hasItem()) {
                  ItemStack itemStack = slot2.getItem();
@@ -240,7 +240,7 @@ index b7285c67ce3f6db2fa23a6dc91fcfa6a3d19f9b4..bca4a8528ec362471797c2d962cd3c90
              }
          } else if (clickType == ClickType.THROW && this.getCarried().isEmpty() && slotId >= 0) {
              Slot slot2 = this.slots.get(slotId);
-@@ -624,15 +624,15 @@ public abstract class AbstractContainerMenu {
+@@ -634,15 +634,15 @@ public abstract class AbstractContainerMenu {
                  int maxStackSize = button == 0 ? 1 : -1;
  
                  for (int i3 = 0; i3 < 2; i3++) {
@@ -259,7 +259,7 @@ index b7285c67ce3f6db2fa23a6dc91fcfa6a3d19f9b4..bca4a8528ec362471797c2d962cd3c90
                                  itemStack.grow(itemStack1.getCount());
                              }
                          }
-@@ -750,7 +750,7 @@ public abstract class AbstractContainerMenu {
+@@ -760,7 +760,7 @@ public abstract class AbstractContainerMenu {
              i = endIndex - 1;
          }
  

leaves-server/minecraft-patches/features/0033-MC-Technical-Survival-Mode.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] MC Technical Survival Mode
 Will automatically overwrite some configuration after startup
 
 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index 68c934aec165690979f066eee73d4b2bc803ed14..5aa3f4270a4a8c11b3d785987bcfc1e06254ccab 100644
+index f68ef6c8209b0bfa288800ac8bd42e1673bb4077..863bf19a9c235be422f6cafb2b77735076801181 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
-@@ -1684,7 +1684,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+@@ -1691,7 +1691,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
      public boolean isInvulnerableTo(ServerLevel level, DamageSource damageSource) {
          return (super.isInvulnerableTo(level, damageSource) // Paper - disable player cramming;
              || this.isChangingDimension() && !damageSource.is(DamageTypes.ENDER_PEARL)

leaves-server/minecraft-patches/features/0034-Return-nether-portal-fix.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Return nether portal fix
 This patch is powered by NetherPortalFix(https://github.com/TwelveIterationMods/NetherPortalFix)
 
 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index 5aa3f4270a4a8c11b3d785987bcfc1e06254ccab..f881077a6cd6eeffac84d866941a400457085ff5 100644
+index 863bf19a9c235be422f6cafb2b77735076801181..ad7df15ad454d896f9b243bad973dcf8496a06af 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
-@@ -1481,6 +1481,21 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+@@ -1488,6 +1488,21 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
                  org.bukkit.event.player.PlayerChangedWorldEvent changeEvent = new org.bukkit.event.player.PlayerChangedWorldEvent(this.getBukkitEntity(), serverLevel.getWorld());
                  this.level().getCraftServer().getPluginManager().callEvent(changeEvent);
                  // CraftBukkit end
@@ -32,7 +32,7 @@ index 5aa3f4270a4a8c11b3d785987bcfc1e06254ccab..f881077a6cd6eeffac84d866941a4004
                  if (this.isBlocking()) {
                      this.stopUsingItem();
 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index de20a6fbbc9731a3b1cd30b3a0785637f6a33778..93eb9e2d4e44881181a07b12249c3812635fec14 100644
+index a79f83991aa50d45695beeeb018f203c6d7ae6d8..46d93b9c063cb056f3051ebe0f3558f5b4f55bea 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
 @@ -852,6 +852,20 @@ public abstract class PlayerList {
@@ -57,7 +57,7 @@ index de20a6fbbc9731a3b1cd30b3a0785637f6a33778..93eb9e2d4e44881181a07b12249c3812
  
          // Save player file again if they were disconnected
 diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
-index 2dd370bf00b5ddf133c946b6e4d37b00be3ca5a5..5e7068bf9b5364c382fccfb110ed2a26a5ac1731 100644
+index 35a00a30a726294d6c6e3d879cfec9fcc7d10028..d1f25cc8efe38b152bb1a0e8886c8024da3ba840 100644
 --- a/net/minecraft/world/entity/LivingEntity.java
 +++ b/net/minecraft/world/entity/LivingEntity.java
 @@ -274,7 +274,7 @@ public abstract class LivingEntity extends Entity implements Attackable {

leaves-server/minecraft-patches/features/0040-Disable-distance-check-for-UseItemOnPacket.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Disable distance check for UseItemOnPacket
 
 
 diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 9955fc7bcf75dbe86c5fcbace2dd1f2ccf479207..29a6d220adeecafa8e8f19c90e392d809fcd7568 100644
+index 771abbc4aeea227b99b069d9d6f58a6b8df4ee5d..19d8998ca4e2a61bcc5c33b2a6fff6ee8deb56c4 100644
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1921,7 +1921,7 @@ public class ServerGamePacketListenerImpl
+@@ -1929,7 +1929,7 @@ public class ServerGamePacketListenerImpl
                  if (this.player.canInteractWithBlock(blockPos, 1.0)) {
                      Vec3 vec3 = location.subtract(Vec3.atCenterOf(blockPos));
                      double d = 1.0000001;

leaves-server/minecraft-patches/features/0042-Syncmatica-Protocol.patch

@@ -6,13 +6,13 @@ Subject: [PATCH] Syncmatica Protocol
 This patch is Powered by Syncmatica(https://github.com/End-Tech/syncmatica)
 
 diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c0e3695e7f25b675aa74ff6125ee821209b5b667..57c68522f7800a8000f3702802a266e441a3dbf3 100644
+index 19d8998ca4e2a61bcc5c33b2a6fff6ee8deb56c4..325300e7ad68b7ad377ff1269bc5d568d663ec3a 100644
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -324,8 +324,11 @@ public class ServerGamePacketListenerImpl
+@@ -326,8 +326,11 @@ public class ServerGamePacketListenerImpl
-         player.getTextFilter().join();
          this.signedMessageDecoder = SignedMessageChain.Decoder.unsigned(player.getUUID(), server::enforceSecureProfile);
          this.chatMessageChain = new FutureChain(server.chatExecutor); // CraftBukkit - async chat
+         this.tickEndEvent = new io.papermc.paper.event.packet.ClientTickEndEvent(player.getBukkitEntity()); // Paper - add client tick end event
 +        this.exchangeTarget = new org.leavesmc.leaves.protocol.syncmatica.exchange.ExchangeTarget(this); // Leaves - Syncmatica Protocol
      }
  

leaves-server/minecraft-patches/features/0050-Elytra-aeronautics-no-chunk-load.patch

@@ -27,10 +27,10 @@ index 36c0a690e7e9b301c5a3d63fae2c7cbe36ba6cdf..6b625fbd538e5a4073e86e22adfcd382
  
          SectionPos lastSectionPos = player.getLastSectionPos();
 diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2b0b594f3d9b53574e2c13ad023a77fe497d50bb..a83f635e929e5a9dd9bbf12228d0f75993d66b32 100644
+index 325300e7ad68b7ad377ff1269bc5d568d663ec3a..b3abfd93b7b4ce47e3382a9f81b82dbb2beb37ae 100644
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -547,7 +547,7 @@ public class ServerGamePacketListenerImpl
+@@ -549,7 +549,7 @@ public class ServerGamePacketListenerImpl
                  speed *= 2f; // TODO: Get the speed of the vehicle instead of the player
  
                  // Paper start - Prevent moving into unloaded chunks
@@ -40,7 +40,7 @@ index 2b0b594f3d9b53574e2c13ad023a77fe497d50bb..a83f635e929e5a9dd9bbf12228d0f759
                          !serverLevel.areChunksLoadedForMove(rootVehicle.getBoundingBox().expandTowards(new Vec3(toX, toY, toZ).subtract(rootVehicle.position())))
                  )) {
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index e901c7cb5c47c0f48a9a666cba80a2af0847e44b..fa03945c0f6c3fba7cd9bbfb93d90d0719825adb 100644
+index 25b7fe802216d805b6426a5b0098d8e41fe48a7d..7dc1aaaf590edcd1e7c6c6734c4baeecbfec93a7 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -1109,7 +1109,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

leaves-server/minecraft-patches/features/0061-Reduce-array-allocations.patch

@@ -126,7 +126,7 @@ index 7e27546bcb587d03b6de2ab43244e6c61fdb55f4..9e94f41e61687e2dacafec9c06646ec7
  
      @Override
 diff --git a/net/minecraft/network/Connection.java b/net/minecraft/network/Connection.java
-index f8a67220ebb72fd446006b7aaed87fc69bd0454d..f94b0148d90329e15801fbb893f02cdddbdb4779 100644
+index 364ddf9f25ef3cb97ba788c469fee9dd495b84a7..fd490f139e901c2ac598f1eab7aa8d50c65ef864 100644
 --- a/net/minecraft/network/Connection.java
 +++ b/net/minecraft/network/Connection.java
 @@ -65,6 +65,7 @@ import org.apache.commons.lang3.Validate;
@@ -138,7 +138,7 @@ index f8a67220ebb72fd446006b7aaed87fc69bd0454d..f94b0148d90329e15801fbb893f02cdd
  public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
      private static final float AVERAGE_PACKETS_SMOOTHING = 0.75F;
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index ed37ba4ca1303a0ce97e7a1fce1b29682276292b..7763d4c818606ed034f28e050166fe8cae16cfb8 100644
+index ff80394fcae884f2a6a700de90c7b495862e532b..a9b9928f371581e6b324622aa9c75aac6d285d7c 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
 @@ -169,6 +169,7 @@ import net.minecraft.world.phys.shapes.Shapes;
@@ -150,7 +150,7 @@ index ed37ba4ca1303a0ce97e7a1fce1b29682276292b..7763d4c818606ed034f28e050166fe8c
  public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLevel, ca.spottedleaf.moonrise.patches.chunk_system.level.ChunkSystemServerLevel, ca.spottedleaf.moonrise.patches.chunk_system.level.ChunkSystemLevelReader, ca.spottedleaf.moonrise.patches.chunk_tick_iteration.ChunkTickServerLevel { // Paper - rewrite chunk system // Paper - chunk tick iteration
      public static final BlockPos END_SPAWN_POINT = new BlockPos(100, 50, 0);
 diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 24f2a1d295a02a8fdc1518f914549a980cd035c9..339be9915708171a5682af8193c09f96f7fba02c 100644
+index b3abfd93b7b4ce47e3382a9f81b82dbb2beb37ae..f0feadb8d4312d6569783c299968a50fe5c2edee 100644
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -245,6 +245,7 @@ import org.bukkit.inventory.CraftingInventory;
@@ -161,7 +161,7 @@ index 24f2a1d295a02a8fdc1518f914549a980cd035c9..339be9915708171a5682af8193c09f96
  
  public class ServerGamePacketListenerImpl
      extends ServerCommonPacketListenerImpl
-@@ -801,7 +802,7 @@ public class ServerGamePacketListenerImpl
+@@ -803,7 +804,7 @@ public class ServerGamePacketListenerImpl
          // Paper start
          final int index;
          if (packet.getCommand().length() > 64 && ((index = packet.getCommand().indexOf(' ')) == -1 || index >= 64)) {

leaves-server/minecraft-patches/features/0074-Replay-Mod-API.patch

@@ -120,10 +120,10 @@ index 5c0a04db38821dbb0cba2bb6f0787f113d167efd..cd153db93f709c3142942fac88ae3ca2
                                          .filter(player -> !playerList.isOp(player.getGameProfile()))
                                          .map(player -> player.getGameProfile().getName()),
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index 4d5c0729675e9057bd94f00a006e067ea9d90116..c0ade1dbf40f308febfec005cab9556fe01f3402 100644
+index a9b9928f371581e6b324622aa9c75aac6d285d7c..4497901e1ca1eacc4984e5899245d48c66406315 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
-@@ -2647,7 +2647,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -2648,7 +2648,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
              if (entity instanceof ServerPlayer serverPlayer) {
                  ServerLevel.this.players.add(serverPlayer);
                  // Leaves start - skip
@@ -132,7 +132,7 @@ index 4d5c0729675e9057bd94f00a006e067ea9d90116..c0ade1dbf40f308febfec005cab9556f
                      ServerLevel.this.realPlayers.add(serverPlayer);
                  }
                  // Leaves end - skip
-@@ -2718,7 +2718,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -2719,7 +2719,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
              if (entity instanceof ServerPlayer serverPlayer) {
                  ServerLevel.this.players.remove(serverPlayer);
                  // Leaves start - skip
@@ -142,7 +142,7 @@ index 4d5c0729675e9057bd94f00a006e067ea9d90116..c0ade1dbf40f308febfec005cab9556f
                  }
                  // Leaves end - skip
 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index 36495470125150a5b3cdc9cacc576e87cbac25bc..da33a137ab2c7f1f9fb47cba4995bf727c364450 100644
+index 46d93b9c063cb056f3051ebe0f3558f5b4f55bea..5cbc1a5296aa2b6b267a8fa1f3edb9cf7857b8cf 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
 @@ -131,6 +131,7 @@ public abstract class PlayerList {

leaves-server/minecraft-patches/features/0100-Allow-grindstone-overstacking.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Allow grindstone overstacking
 
 
 diff --git a/net/minecraft/world/inventory/AbstractContainerMenu.java b/net/minecraft/world/inventory/AbstractContainerMenu.java
-index bca4a8528ec362471797c2d962cd3c903cae89f2..07da1f42bd11236e037bd8cc25e79eae93fd20ae 100644
+index f5a6d01037235b120e13cde9134e5ac0fc2d2c00..2a470ea583b7f192e8dd07f25867dd51dc1ec3e7 100644
 --- a/net/minecraft/world/inventory/AbstractContainerMenu.java
 +++ b/net/minecraft/world/inventory/AbstractContainerMenu.java
-@@ -736,10 +736,15 @@ public abstract class AbstractContainerMenu {
+@@ -746,10 +746,15 @@ public abstract class AbstractContainerMenu {
      public abstract boolean stillValid(Player player);
  
      protected boolean moveItemStackTo(ItemStack stack, int startIndex, int endIndex, boolean reverseDirection) {
@@ -24,7 +24,7 @@ index bca4a8528ec362471797c2d962cd3c903cae89f2..07da1f42bd11236e037bd8cc25e79eae
          if (isCheck) {
              stack = stack.copy();
          }
-@@ -804,6 +809,14 @@ public abstract class AbstractContainerMenu {
+@@ -814,6 +819,14 @@ public abstract class AbstractContainerMenu {
                  // Paper end - Add PlayerTradeEvent and PlayerPurchaseEvent
                  if (itemx.isEmpty() && slotx.mayPlace(stack)) {
                      int i1 = slotx.getMaxStackSize(stack);

leaves-server/minecraft-patches/features/0113-Fix-CraftPortalEvent-logic.patch

@@ -5,22 +5,18 @@ Subject: [PATCH] Fix CraftPortalEvent logic
 
 
 diff --git a/net/minecraft/world/level/block/EndPortalBlock.java b/net/minecraft/world/level/block/EndPortalBlock.java
-index 01cddd7001b4a7f99c1b1d147fac904d3064d733..e0999bda26b5a6b17076760f5b124c061a873b74 100644
+index c11366dd69e1c51bdab45c625b07c15ce2e42cb6..31ac2e7047065333d5033ea2ef4c56877a425ee7 100644
 --- a/net/minecraft/world/level/block/EndPortalBlock.java
 +++ b/net/minecraft/world/level/block/EndPortalBlock.java
-@@ -102,13 +102,13 @@ public class EndPortalBlock extends BaseEntityBlock implements Portal {
+@@ -102,9 +102,9 @@ public class EndPortalBlock extends BaseEntityBlock implements Portal {
              }
  
              // CraftBukkit start
--            org.bukkit.craftbukkit.event.CraftPortalEvent event = entity.callPortalEvent(entity, org.bukkit.craftbukkit.util.CraftLocation.toBukkit(bottomCenter, level1.getWorld(), f, entity.getXRot()), org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.END_PORTAL, 0, 0);
+-            set.removeAll(Relative.ROTATION); // remove relative rotation flags to simplify event mutation
-+            org.bukkit.craftbukkit.event.CraftPortalEvent event = entity.callPortalEvent(entity, org.bukkit.craftbukkit.util.CraftLocation.toBukkit(bottomCenter, level1.getWorld(), f, 0.0F), org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.END_PORTAL, 0, 0); // Leaves - fix
++            // set.removeAll(Relative.ROTATION); // remove relative rotation flags to simplify event mutation // Leaves - no
+             float absoluteYaw = flag ? f : entity.getYRot() + f;
+-            org.bukkit.craftbukkit.event.CraftPortalEvent event = entity.callPortalEvent(entity, org.bukkit.craftbukkit.util.CraftLocation.toBukkit(bottomCenter, level1.getWorld(), absoluteYaw, entity.getXRot()), org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.END_PORTAL, 0, 0);
++            org.bukkit.craftbukkit.event.CraftPortalEvent event = entity.callPortalEvent(entity, org.bukkit.craftbukkit.util.CraftLocation.toBukkit(bottomCenter, level1.getWorld(), absoluteYaw, 0.0F), org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.END_PORTAL, 0, 0); // Leaves - fix
              if (event == null) {
                  return null;
              }
-             org.bukkit.Location to = event.getTo();
- 
--            return new TeleportTransition(((org.bukkit.craftbukkit.CraftWorld) to.getWorld()).getHandle(), org.bukkit.craftbukkit.util.CraftLocation.toVec3D(to), entity.getDeltaMovement(), to.getYaw(), to.getPitch(), set, TeleportTransition.PLAY_PORTAL_SOUND.then(TeleportTransition.PLACE_PORTAL_TICKET), org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.END_PORTAL);
-+            return new TeleportTransition(((org.bukkit.craftbukkit.CraftWorld) to.getWorld()).getHandle(), org.bukkit.craftbukkit.util.CraftLocation.toVec3D(to), Vec3.ZERO, to.getYaw(), to.getPitch(), set, TeleportTransition.PLAY_PORTAL_SOUND.then(TeleportTransition.PLACE_PORTAL_TICKET), org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.END_PORTAL); // Leaves - fix
-             // CraftBukkit end
-         }
-     }

leaves-server/paper-patches/features/0009-Disable-packet-limit.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Disable packet limit
 
 
 diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index 42777adb028fe282c1619aeb5431c442ad5df0d0..90d448f9b183d0dd31db8eaf43bd039eeace5c65 100644
+index e3a7e6937122413bff911fe1188e3bb0297f6ffa..2a5a0c53c23a1ffa3bdfc4926d71e9bfce0d597c 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-@@ -282,7 +282,7 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -286,7 +286,7 @@ public class GlobalConfiguration extends ConfigurationPart {
              }
  
              public boolean isEnabled() {

leaves-server/paper-patches/features/0012-Replay-Mod-API.patch

@@ -64,10 +64,10 @@ index 2b441ba89c603903267db63c7515b0de2cbe09b1..81c8a0a236a892afd56b8fbc56427bb6
          // 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 218a27def751fb657cdeee102d9ec4b26025bb30..f746ec4e38a6191c68c35a98fb90dcadb349d837 100644
+index 5050f446e75f0ec17daf994ed74cbcd3155664c1..fdce5bac830b669ce979044ada5379318a17215d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2258,7 +2258,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2260,7 +2260,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public boolean canSee(Player player) {

leaves-server/paper-patches/features/0014-Bytebuf-API.patch

@@ -33,12 +33,12 @@ index 9668eeb821075abee8da35d849090d4f5ba75cae..d0639618ff9c179aaa8d591f7c1b9251
 +    // Leaves end - Bytebuf API
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f746ec4e38a6191c68c35a98fb90dcadb349d837..8acec30c9c8b098358001e6a51444ef0e799f608 100644
+index fdce5bac830b669ce979044ada5379318a17215d..b2c144a19677bef9f8a3258583fd1c142e2d0c10 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3599,4 +3599,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3624,4 +3624,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
- 
+     public void setSimplifyContainerDesyncCheck(final boolean simplifyContainerDesyncCheck) {
-         return forwardMovement == backwardMovement ? 0 : forwardMovement ? 1 : -1;
+         this.simplifyContainerDesyncCheck = simplifyContainerDesyncCheck;
      }
 +
 +    // Leaves start - Bytebuf API