update upstream

Author: Blast-MC

gradle.properties

@@ -1,7 +1,7 @@
 group=gg.projecteden.parchment
 version=1.21.8-R0.1-SNAPSHOT
 mcVersion=1.21.8
-paperRef=103187750e29fd982b84b2bab114fe5af98a82e5
+paperRef=614e9acfca696b98b810c65e3582993fcefc321e
 
 org.gradle.configuration-cache=true
 org.gradle.caching=true

parchment-api/paper-patches/files/src/main/java/org/bukkit/World.java.patch

@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -51,6 +_,36 @@
+@@ -52,6 +_,36 @@
   */
  public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient, Metadatable, PersistentDataHolder, Keyed, net.kyori.adventure.audience.ForwardingAudience { // Paper
 

parchment-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayer.java.patch

@@ -8,7 +8,7 @@
  import org.slf4j.Logger;
 
  public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patches.chunk_system.player.ChunkSystemServerPlayer { // Paper - rewrite chunk system
-@@ -2500,7 +_,7 @@
+@@ -2504,7 +_,7 @@
                  event.isForced()
              );
              if (event.willNotifyPlayer() && event.getNotification() != null) {
@@ -17,7 +17,7 @@
              }
          }
 
-@@ -2527,12 +_,20 @@
+@@ -2531,12 +_,20 @@
 
      @Override
      public void playNotifySound(SoundEvent sound, SoundSource source, float volume, float pitch) {

parchment-server/minecraft-patches/sources/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch

@@ -23,7 +23,7 @@
          if (org.spigotmc.SpigotConfig.enableSpamExclusions) {
              for (String exclude : org.spigotmc.SpigotConfig.spamExclusions) {
                  if (exclude != null && message.startsWith(exclude)) {
-@@ -3245,9 +_,11 @@
+@@ -3246,9 +_,11 @@
      public void handlePlaceRecipe(ServerboundPlaceRecipePacket packet) {
          // Paper start - auto recipe limit
          if (!org.bukkit.Bukkit.isPrimaryThread()) {

parchment-server/minecraft-patches/sources/net/minecraft/server/players/PlayerList.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
-@@ -767,19 +_,7 @@
+@@ -765,19 +_,7 @@
                  BlockPos blockPos = respawnConfig.pos();
                  BlockState blockState = level1.getBlockState(blockPos);
                  if (blockState.is(Blocks.RESPAWN_ANCHOR)) {

parchment-server/minecraft-patches/sources/net/minecraft/world/entity/LivingEntity.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/entity/LivingEntity.java
 +++ b/net/minecraft/world/entity/LivingEntity.java
-@@ -4199,7 +_,7 @@
+@@ -4215,7 +_,7 @@
          Vec3 direction = this.getLookAngle();
          Vec3 end = start.add(direction.x * maxDistance, direction.y * maxDistance, direction.z * maxDistance);
 

parchment-server/paper-patches/files/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java.patch

@@ -1,6 +1,6 @@
 --- a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
-@@ -307,6 +_,7 @@
+@@ -308,6 +_,7 @@
              }
 
              public boolean disablePlayerCrits = false;

parchment-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftWorld.java.patch

@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2488,4 +_,16 @@
+@@ -2490,4 +_,16 @@
          return POINTERS_SUPPLIER.view(this);
      }
      // Paper end

parchment-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java.patch

@@ -1,19 +1,11 @@
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -225,6 +_,9 @@
-     private int hash = 0;
-     private double health = 20;
-     // Paper end
+@@ -3522,4 +_,41 @@
+     public PlayerGameConnection getConnection() {
+         return this.getHandle().connection.playerGameConnection;
+     }
 +
 +    private boolean bypassesInsomnia = false; // Parchment - Insomnia api
-+
-     // Spigot start
-     private final Player.Spigot spigot = new Player.Spigot() {
- 
-@@ -3600,4 +_,40 @@
-             this(new ShortArraySet(), new ArrayList<>());
-         }
-     }
 +
 +    // Parchment start
 +    @Override
@@ -48,6 +40,5 @@
 +    public int getTimeSinceLastRest() {
 +        return net.minecraft.util.Mth.clamp(this.getHandle().getStats().getValue(net.minecraft.stats.Stats.CUSTOM.get(net.minecraft.stats.Stats.TIME_SINCE_REST)), 1, Integer.MAX_VALUE);
 +    }
-+
 +
  }

parchment-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java.patch

@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-@@ -745,11 +_,12 @@
+@@ -746,11 +_,12 @@
              this.setMaxDamage(maxDamage);
          }
 
@@ -14,7 +14,51 @@
                  this.deserializeInternal(internalTag, map);
              } catch (IOException ex) {
                  LOGGER.error("Failed to read internal tag from object", ex);
-@@ -812,6 +_,18 @@
+@@ -762,23 +_,26 @@
+             ByteArrayInputStream buf = new ByteArrayInputStream(Base64.getDecoder().decode(unhandled));
+             try {
+                 CompoundTag unhandledTag = NbtIo.readCompressed(buf, NbtAccounter.unlimitedHeap());
+-                DataComponentPatch unhandledPatch = DataComponentPatch.CODEC.parse(CraftRegistry.getMinecraftRegistry().createSerializationContext(NbtOps.INSTANCE), unhandledTag).result().get();
+-
+-                CraftMetaItem.getOrEmpty(unhandledPatch, CraftMetaItem.CAN_PLACE_ON).ifPresent(data -> {
+-                    this.canPlaceOnPredicates = List.copyOf(data.predicates);
+-                });
+-                CraftMetaItem.getOrEmpty(unhandledPatch, CraftMetaItem.CAN_BREAK).ifPresent(data -> {
+-                    this.canBreakPredicates = List.copyOf(data.predicates);
+-                });
+-                this.unhandledTags.copy(unhandledPatch.forget(type -> type == CraftMetaItem.CAN_PLACE_ON.TYPE || type == CraftMetaItem.CAN_BREAK.TYPE));
+-
+-                for (Entry<DataComponentType<?>, Optional<?>> entry : unhandledPatch.entrySet()) {
+-                    // Move removed unhandled tags to dedicated removedTags
+-                    if (entry.getValue().isEmpty()) {
+-                        DataComponentType<?> key = entry.getKey();
+-
+-                        this.unhandledTags.clear(key);
+-                        this.removedTags.add(key);
++                Optional<DataComponentPatch> unhandledPatchOptional = DataComponentPatch.CODEC.parse(CraftRegistry.getMinecraftRegistry().createSerializationContext(NbtOps.INSTANCE), unhandledTag).result();
++                if (unhandledPatchOptional.isPresent()) {
++                    DataComponentPatch unhandledPatch = unhandledPatchOptional.get();
++
++                    CraftMetaItem.getOrEmpty(unhandledPatch, CraftMetaItem.CAN_PLACE_ON).ifPresent(data -> {
++                        this.canPlaceOnPredicates = List.copyOf(data.predicates);
++                    });
++                    CraftMetaItem.getOrEmpty(unhandledPatch, CraftMetaItem.CAN_BREAK).ifPresent(data -> {
++                        this.canBreakPredicates = List.copyOf(data.predicates);
++                    });
++                    this.unhandledTags.copy(unhandledPatch.forget(type -> type == CraftMetaItem.CAN_PLACE_ON.TYPE || type == CraftMetaItem.CAN_BREAK.TYPE));
++
++                    for (Entry<DataComponentType<?>, Optional<?>> entry : unhandledPatch.entrySet()) {
++                        // Move removed unhandled tags to dedicated removedTags
++                        if (entry.getValue().isEmpty()) {
++                            DataComponentType<?> key = entry.getKey();
++
++                            this.unhandledTags.clear(key);
++                            this.removedTags.add(key);
++                        }
+                     }
+                 }
+             } catch (IOException ex) {
+@@ -813,6 +_,18 @@
                  this.customTag = NbtIo.readCompressed(buf, NbtAccounter.unlimitedHeap());
              } catch (IOException ex) {
                  LOGGER.error("Failed to read custom tag for item", ex);