Update Paper

gradle.properties

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

patches/api/0008-Force-peaceful-mode-switch.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Force peaceful mode switch
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index d8a23aa0d898ca3360757721e38ddb97387f7d21..d744614204a840012b51e1f40148caf5f9dc6097 100644
+index adcd8161846b06fd1a7895750f98b629204a8406..30285b70f3fb6b63b41c052e86ff9a61594ea1ec 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -4213,6 +4213,12 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -4229,6 +4229,12 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
      void setSendViewDistance(int viewDistance);
      // Paper end - view distance api
 

patches/server/0004-Leaves-Server-Utils.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Leaves Server Utils
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 490ee48346395fcbaf2eb0151e9248f18974fea6..7d7258c56cfade2d82acdf83dfa20cd0416c0dab 100644
+index bc45c74987974b4828201e06fc8b1f3fbc0af8b4..7ea72dcc310a363246eb7d77c49ed25a7f14d2fa 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -429,6 +429,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -36,7 +36,7 @@ index 490ee48346395fcbaf2eb0151e9248f18974fea6..7d7258c56cfade2d82acdf83dfa20cd0
 
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.forThrowable(throwable, "Loading entity NBT");
-@@ -4988,4 +4995,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4990,4 +4997,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          return ((net.minecraft.server.level.ServerChunkCache) level.getChunkSource()).isPositionTicking(this);
      }
      // Paper end - Expose entity id counter

patches/server/0008-Fix-trading-with-the-void.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix trading with the void
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index af57e7aefc757be8ed9e2238e1e01973f57bf091..b835b259d9e371ff18b1704249b290d1ecbe06e1 100644
+index 14e9140c9a18906c249e8cef39988ed7f81738f7..f30848556e677973c913ae481b268f51be90832a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2563,11 +2563,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+@@ -2565,11 +2565,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
              // 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

patches/server/0010-Fakeplayer-support.patch

@@ -148,7 +148,7 @@ index 50e79870db5424e47c9cb5f3866557008f580071..0451f7499121a53ce1bd13130581548f
 
              }
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index b696d57fe7b250203671dd407571618f546f0c21..51668af88555fc0cca347f56b9aaafbed0d41b04 100644
+index f30848556e677973c913ae481b268f51be90832a..82fe09e3ac6388611a168946f0c457f6fdf0d674 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -228,6 +228,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -167,7 +167,7 @@ index b696d57fe7b250203671dd407571618f546f0c21..51668af88555fc0cca347f56b9aaafbe
      }
 
      // Paper start
-@@ -2024,6 +2026,12 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+@@ -2026,6 +2028,12 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
          return this.players;
      }
 
@@ -180,7 +180,7 @@ index b696d57fe7b250203671dd407571618f546f0c21..51668af88555fc0cca347f56b9aaafbe
      @Override
      public void onBlockStateChange(BlockPos pos, BlockState oldBlock, BlockState newBlock) {
          Optional<Holder<PoiType>> optional = PoiTypes.forState(oldBlock);
-@@ -2495,6 +2503,11 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+@@ -2497,6 +2505,11 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
              // 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 entityplayer) {
                  ServerLevel.this.players.add(entityplayer);
@@ -192,7 +192,7 @@ index b696d57fe7b250203671dd407571618f546f0c21..51668af88555fc0cca347f56b9aaafbe
                  ServerLevel.this.updateSleepingPlayerList();
              }
 
-@@ -2572,6 +2585,11 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+@@ -2574,6 +2587,11 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
              ServerLevel.this.getChunkSource().removeEntity(entity);
              if (entity instanceof ServerPlayer entityplayer) {
                  ServerLevel.this.players.remove(entityplayer);
@@ -364,7 +364,7 @@ index e6a1942d44c589d6815824646b5517a5938385c3..e53e5011af49da4222f4c38e31f15001
 
      public boolean canBypassPlayerLimit(GameProfile profile) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a1946e6346a8d4afa0f7ebe69e7ac866432e08ab..cb67c961ad3a34fb58172c3f4176e82fadfe199e 100644
+index 7ea72dcc310a363246eb7d77c49ed25a7f14d2fa..03fdcd134179d41c84ad38fbdf108acb36fee01e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1455,7 +1455,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -544,7 +544,7 @@ index 275704db5b984584504749437e8ecdc60d4aa871..51365bf3a487725c79a8a3adae0821ce
 +    // Leaves end - Bot API
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index cd3381d8225e0322b3e285b3c4aa0a1265a91cc0..9fbf9772b94cbead2567e3485e6e0e3f6fe57aa1 100644
+index 38b046da5acac8633db8618a2957187d291f5e73..ea49d32a728fafe1dbd8b6c4f60b552550e78cd2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -210,7 +210,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -556,7 +556,7 @@ index cd3381d8225e0322b3e285b3c4aa0a1265a91cc0..9fbf9772b94cbead2567e3485e6e0e3f
      }
 
      @Override
-@@ -1252,9 +1252,9 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1254,9 +1254,9 @@ public class CraftWorld extends CraftRegionAccessor implements World {
 
      @Override
      public List<Player> getPlayers() {
@@ -568,7 +568,7 @@ index cd3381d8225e0322b3e285b3c4aa0a1265a91cc0..9fbf9772b94cbead2567e3485e6e0e3f
              HumanEntity bukkitEntity = human.getBukkitEntity();
 
              if ((bukkitEntity != null) && (bukkitEntity instanceof Player)) {
-@@ -1939,7 +1939,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1941,7 +1941,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      public void playSound(final net.kyori.adventure.sound.Sound sound) {
          org.spigotmc.AsyncCatcher.catchOp("play sound"); // Paper
          final long seed = sound.seed().orElseGet(this.world.getRandom()::nextLong);
@@ -577,7 +577,7 @@ index cd3381d8225e0322b3e285b3c4aa0a1265a91cc0..9fbf9772b94cbead2567e3485e6e0e3f
              player.connection.send(io.papermc.paper.adventure.PaperAdventure.asSoundPacket(sound, player.getX(), player.getY(), player.getZ(), seed, null));
          }
      }
-@@ -1955,7 +1955,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1957,7 +1957,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          org.spigotmc.AsyncCatcher.catchOp("play sound"); // Paper
          final long seed = sound.seed().orElseGet(this.getHandle().getRandom()::nextLong);
          if (emitter == net.kyori.adventure.sound.Sound.Emitter.self()) {
@@ -586,7 +586,7 @@ index cd3381d8225e0322b3e285b3c4aa0a1265a91cc0..9fbf9772b94cbead2567e3485e6e0e3f
                  player.connection.send(io.papermc.paper.adventure.PaperAdventure.asSoundPacket(sound, player, seed, null));
              }
          } else if (emitter instanceof CraftEntity craftEntity) {
-@@ -2176,7 +2176,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2178,7 +2178,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
              Preconditions.checkArgument(particle.getDataType().isInstance(data), "data (%s) should be %s", data.getClass(), particle.getDataType());
          }
          this.getHandle().sendParticles(
@@ -596,7 +596,7 @@ index cd3381d8225e0322b3e285b3c4aa0a1265a91cc0..9fbf9772b94cbead2567e3485e6e0e3f
                  CraftParticle.createParticleParam(particle, data), // Particle
                  x, y, z, // Position
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index cd789c235acf740ec29c30b180e7fbe1a140caa9..9c3df47ae65289c27a1d63ac06ca41c074ff374e 100644
+index 89c8713d2c2206d1b0d8c0a392c9d13b3e736f0c..48d3e8c718fb0d2926f6b2f26855bbbe115ccf7a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -94,6 +94,8 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {

patches/server/0023-Config-to-disable-method-profiler.patch

@@ -22,10 +22,10 @@ index cb863f07d00e96b92e73dc312606110c259b4d5c..4c8cf72e44e991920ed6a6110d811530
      }
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 33a5137b1057fe6203e10f9e7e0cb7c4251466e9..e935903d918f12e5e1617ebf2d74399b9cd4f79c 100644
+index 73b1b5b8b3723f068e45874eb251f08ef0a93017..7a15e89bd5bf19cbd5dd115b83a0d3fc63faaa2d 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -1937,6 +1937,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
+@@ -1954,6 +1954,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
      }
 
      public ProfilerFiller getProfiler() {

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

@@ -156,10 +156,10 @@ index f933fa419a4b55b0096ff42caf1b071d027b8e7e..c8891f72d3353faf4afe5b49e1759ee0
 
      @Override
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java
-index bf2c303a314205590a2839e0f729af3a9ff40a86..668eb459a6772055ebd99a0723df127453c4af57 100644
+index 0a93bacd62249bae1800ff306b8a7c765b0e5a8b..9561d804ef47d11a492531f8e8a419f905b48c17 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java
-@@ -332,6 +332,16 @@ public class BrewingStandBlockEntity extends BaseContainerBlockEntity implements
+@@ -344,6 +344,16 @@ public class BrewingStandBlockEntity extends BaseContainerBlockEntity implements
          return this.canPlaceItem(slot, stack);
      }
 

patches/server/0040-Stackable-ShulkerBoxes.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Stackable ShulkerBoxes
 This patch is Powered by fabric-carpet(https://github.com/gnembon/fabric-carpet) and plusls-carpet-addition(https://github.com/plusls/plusls-carpet-addition)
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index fcccf989c25f0a259b160c4ff7873f7009e64d14..af8a2b3b37aba58cb402040e178c46f53aa3e93d 100644
+index befeaac4786760f6847a5945da2296a3e68dbb17..1625d99c80df1bac8b6e17b137ea4b01eed50add 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3407,7 +3407,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3415,7 +3415,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
              }
 
              boolean flag1 = packet.slotNum() >= 1 && packet.slotNum() <= 45;
@@ -307,25 +307,25 @@ index eec0ec43590be7e8ae5b530a7404c98b5e23cb53..2a2b9631a16c16f41261b7e042acd14d
      private Entity entityRepresentation;
 
 diff --git a/src/main/java/net/minecraft/world/level/block/AbstractCauldronBlock.java b/src/main/java/net/minecraft/world/level/block/AbstractCauldronBlock.java
-index 20f2b575c8131621edea0e75fbf38a9fe20a36c4..812856b02cab1c437550ba9c706da318cf420338 100644
+index 4fdef6d7bcea0cf6b7d90324398af597660c80e3..b84d03bc51d081775207abd9ce1f4da80c0588eb 100644
 --- a/src/main/java/net/minecraft/world/level/block/AbstractCauldronBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/AbstractCauldronBlock.java
 @@ -58,9 +58,27 @@ public abstract class AbstractCauldronBlock extends Block {
          ItemStack stack, BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit
      ) {
          CauldronInteraction cauldronInteraction = this.interactions.map().get(stack.getItem());
--        return cauldronInteraction.interact(state, world, pos, player, hand, stack);
-+        return wrapInteractor(cauldronInteraction, state, world, pos, player, hand, stack);
+-        return cauldronInteraction.interact(state, world, pos, player, hand, stack, hit.getDirection()); // Paper - pass hit direction
++        return wrapInteractor(cauldronInteraction, state, world, pos, player, hand, stack, hit.getDirection()); // Paper - pass hit direction // Leaves - stackable shulker boxes
      }
 
 +    // Leaves start - stackable shulker boxes
-+    private ItemInteractionResult wrapInteractor(CauldronInteraction cauldronBehavior, BlockState blockState, Level world, BlockPos blockPos, Player playerEntity, InteractionHand hand, ItemStack itemStack) {
++    private ItemInteractionResult wrapInteractor(CauldronInteraction cauldronBehavior, BlockState blockState, Level world, BlockPos blockPos, Player playerEntity, InteractionHand hand, ItemStack itemStack, net.minecraft.core.Direction hitDirection) {
 +        int count = -1;
 +        if (org.leavesmc.leaves.LeavesConfig.shulkerBoxStackSize > 1 && itemStack.getItem() instanceof net.minecraft.world.item.BlockItem bi &&
 +            bi.getBlock() instanceof ShulkerBoxBlock) {
 +            count = itemStack.getCount();
 +        }
-+        ItemInteractionResult result = cauldronBehavior.interact(blockState, world, blockPos, playerEntity, hand, itemStack);
++        ItemInteractionResult result = cauldronBehavior.interact(blockState, world, blockPos, playerEntity, hand, itemStack, hitDirection);
 +        if (count > 0 && result.consumesAction()) {
 +            ItemStack current = playerEntity.getItemInHand(hand);
 +            if (current.getItem() instanceof net.minecraft.world.item.BlockItem bi && bi.getBlock() instanceof ShulkerBoxBlock) {

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

@@ -39,10 +39,10 @@ index 1029b6de6f36b08bf634b4056ef5701383f6f258..64bb056d409c19eca724caa8512e6a59
              throw new RuntimeException("Could not reload paper configuration files", ex);
          }
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index abb9310cca1678f6feeb942ba406870ee945659e..b22845efd93371bc5186f1fd6b3857457f1b86ec 100644
+index 2eb2f244ff8a69c606b49f208c934afe4ee5f59f..e8fa04e83aa80d8284aa58bf3899f5c81e4a2ef6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2507,7 +2507,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+@@ -2509,7 +2509,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
          public void onTickingEnd(Entity entity) {
              ServerLevel.this.entityTickList.remove(entity);
              // Paper start - Reset pearls when they stop being ticked

patches/server/0066-No-block-update-command.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] No block update command
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index f10018a3f79744ce0c78ee3020ec0f5d95b1ed4d..542531451c63392262fa81ec62ff7143e455e04c 100644
+index e8fa04e83aa80d8284aa58bf3899f5c81e4a2ef6..f494ea2671f219ce02c53ad725cc41646558a4c4 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2298,6 +2298,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+@@ -2300,6 +2300,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
 
      @Override
      public void blockUpdated(BlockPos pos, Block block) {
@@ -17,7 +17,7 @@ index f10018a3f79744ce0c78ee3020ec0f5d95b1ed4d..542531451c63392262fa81ec62ff7143
              // CraftBukkit start
              if (this.populating) {
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 4a790406e8031feba3b8bdc6e2fb9d17d1a7fbff..8302dad8ce041ca51f860e2ca0d556b1cf16ba29 100644
+index 2a2b9631a16c16f41261b7e042acd14d600df230..952be4dde6518e1459b1a4262b6c5aa13b17ace5 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -527,7 +527,7 @@ public final class ItemStack implements DataComponentHolder {

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 e5ead8e57e8c527e0906816b741db20b346880d1..c19bd6fbf050f7552acd80fa0381a5b2a89dd433 100644
+index 715f61b7715502aec948bd0bde02a2e45350421f..d27ec46cd0980ab8b554452300b4eb2dd3c92492 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
@@ -31,7 +31,7 @@ index e5ead8e57e8c527e0906816b741db20b346880d1..c19bd6fbf050f7552acd80fa0381a5b2
          final Vec3 originalMovement = movement; // Paper - Expose pre-collision velocity
          // Paper start - detailed watchdog information
          ca.spottedleaf.moonrise.common.util.TickThread.ensureTickThread("Cannot move an entity off-main");
-@@ -4162,6 +4170,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4164,6 +4172,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      }
 
      public final void setBoundingBox(AABB boundingBox) {