Merge branch 'ver/1.21.1' into chore/bring-back-pufferfish

README.md

@@ -67,7 +67,7 @@ Maven
 <dependency>
     <groupId>org.purpurmc.purpur</groupId>
     <artifactId>purpur-api</artifactId>
-    <version>1.21-R0.1-SNAPSHOT</version>
+    <version>1.21.1-R0.1-SNAPSHOT</version>
     <scope>provided</scope>
 </dependency>
 ```
@@ -80,7 +80,7 @@ repositories {
 ```
 ```kotlin
 dependencies {
-    compileOnly("org.purpurmc.purpur:purpur-api:1.21-R0.1-SNAPSHOT")
+    compileOnly("org.purpurmc.purpur:purpur-api:1.21.1-R0.1-SNAPSHOT")
 }
 ```
 

gradle.properties

@@ -1,8 +1,8 @@
 group = org.purpurmc.purpur
-version = 1.21-R0.1-SNAPSHOT
+version = 1.21.1-R0.1-SNAPSHOT
 
-mcVersion = 1.21
-paperCommit = df3b6544f74be73c8882b97c43d39022340f2d74
+mcVersion = 1.21.1
+paperCommit = 11b4ac7c659ffb7e4790b0856b14117b6d532200
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/api/0016-Anvil-API.patch

@@ -5,21 +5,88 @@ Subject: [PATCH] Anvil API
 
 
 diff --git a/src/main/java/org/bukkit/inventory/AnvilInventory.java b/src/main/java/org/bukkit/inventory/AnvilInventory.java
-index c60be4fd24c7fdf65251dd6169e5e1ac3b588d95..569deccd2f1cf21da9b5906433ac493c1f2081be 100644
+index f1f97a85ec713c05c882d7588f4a3e4a017f4795..813f6cd253322538bdf96eb323dd23a7809a1c1e 100644
 --- a/src/main/java/org/bukkit/inventory/AnvilInventory.java
 +++ b/src/main/java/org/bukkit/inventory/AnvilInventory.java
-@@ -123,4 +123,14 @@ public interface AnvilInventory extends Inventory {
+@@ -138,4 +138,42 @@ public interface AnvilInventory extends Inventory {
          setItem(2, result);
      }
      // Paper end
 +
 +    // Purpur start
++    /**
++     * Gets if the player viewing the anvil inventory can bypass experience cost
++     *
++     * @return whether the player viewing the anvil inventory can bypass the experience cost
++     * @deprecated use {@link AnvilView#canBypassCost()}.
++     */
++    @Deprecated(forRemoval = true, since = "1.21")
 +    boolean canBypassCost();
 +
++    /**
++     * Set if the player viewing the anvil inventory can bypass the experience cost
++     *
++     * @param bypassCost whether the player viewing the anvil inventory can bypass the experience cost
++     * @deprecated use {@link AnvilView#setBypassCost(boolean)}.
++     */
++    @Deprecated(forRemoval = true, since = "1.21")
 +    void setBypassCost(boolean bypassCost);
 +
++    /**
++     * Gets if the player viewing the anvil inventory can do unsafe enchants
++     *
++     * @return whether the player viewing the anvil inventory can do unsafe enchants
++     * @deprecated use {@link AnvilView#canDoUnsafeEnchants()}.
++     */
++    @Deprecated(forRemoval = true, since = "1.21")
 +    boolean canDoUnsafeEnchants();
 +
++    /**
++     * Set if the player viewing the anvil inventory can do unsafe enchants
++     *
++     * @param canDoUnsafeEnchants whether the player viewing the anvil inventory can do unsafe enchants
++     * @deprecated use {@link AnvilView#setDoUnsafeEnchants(boolean)}.
++     */
++    @Deprecated(forRemoval = true, since = "1.21")
++    void setDoUnsafeEnchants(boolean canDoUnsafeEnchants);
++    // Purpur end
+ }
+diff --git a/src/main/java/org/bukkit/inventory/view/AnvilView.java b/src/main/java/org/bukkit/inventory/view/AnvilView.java
+index 0344b3db789baf1da0b59f2d2cd66154b69b38a9..4b130327c84b05938d21d563f78361f9483a6a4e 100644
+--- a/src/main/java/org/bukkit/inventory/view/AnvilView.java
++++ b/src/main/java/org/bukkit/inventory/view/AnvilView.java
+@@ -59,4 +59,34 @@ public interface AnvilView extends InventoryView {
+      * @param levels the levels to set
+      */
+     void setMaximumRepairCost(int levels);
++
++    // Purpur start
++    /**
++     * Gets if the player viewing the anvil inventory can bypass experience cost
++     *
++     * @return whether the player viewing the anvil inventory can bypass the experience cost
++     */
++    boolean canBypassCost();
++
++    /**
++     * Set if the player viewing the anvil inventory can bypass the experience cost
++     *
++     * @param bypassCost whether the player viewing the anvil inventory can bypass the experience cost
++     */
++    void setBypassCost(boolean bypassCost);
++
++    /**
++     * Gets if the player viewing the anvil inventory can do unsafe enchants
++     *
++     * @return whether the player viewing the anvil inventory can do unsafe enchants
++     */
++    boolean canDoUnsafeEnchants();
++
++    /**
++     * Set if the player viewing the anvil inventory can do unsafe enchants
++     *
++     * @param canDoUnsafeEnchants whether the player viewing the anvil inventory can do unsafe enchants
++     */
 +    void setDoUnsafeEnchants(boolean canDoUnsafeEnchants);
 +    // Purpur end
  }

patches/generated-api/0001-Ridables.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Ridables
 
 
 diff --git a/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-index 3add91218dd3f07052aa932f0503d1f10ac3799b..fa119ead66390aaed9436fbbaf2abdcef71c4c64 100644
+index 02411466bdcf4ff731f01ccebb2c99942e0db878..e81f3efa9986a3199ceb8e58c93dcf48d358fd35 100644
 --- a/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 +++ b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 @@ -436,6 +436,12 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
@@ -18,6 +18,6 @@ index 3add91218dd3f07052aa932f0503d1f10ac3799b..fa119ead66390aaed9436fbbaf2abdce
 +    GoalKey<Llama> LLAMA_HAS_RIDER = GoalKey.of(Llama.class, NamespacedKey.minecraft("llama_has_rider"));
 +    // Purpur end
 +
-     private static <T extends Mob> @NotNull GoalKey<T> create(final @NotNull String key,
-             final @NotNull Class<T> type) {
+     private static <T extends Mob> @NonNull GoalKey<T> create(final @NonNull String key,
+             final @NonNull Class<T> type) {
          return GoalKey.of(type, NamespacedKey.minecraft(key));

patches/generated-api/0002-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms
 
 
 diff --git a/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-index fa119ead66390aaed9436fbbaf2abdcef71c4c64..596308b83ef30471d8ab60fdc6065480909d6271 100644
+index e81f3efa9986a3199ceb8e58c93dcf48d358fd35..7c814236923319f41de9abd5cbc12f95ce95b525 100644
 --- a/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 +++ b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 @@ -440,6 +440,8 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
@@ -16,4 +16,4 @@ index fa119ead66390aaed9436fbbaf2abdcef71c4c64..596308b83ef30471d8ab60fdc6065480
 +    GoalKey<Phantom> ORBIT_CRYSTAL = GoalKey.of(Phantom.class, NamespacedKey.minecraft("orbit_crystal"));
      // Purpur end
 
-     private static <T extends Mob> @NotNull GoalKey<T> create(final @NotNull String key,
+     private static <T extends Mob> @NonNull GoalKey<T> create(final @NonNull String key,

patches/generated-api/0003-Add-option-to-disable-zombie-aggressiveness-towards-.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Add option to disable zombie aggressiveness towards villagers
 
 
 diff --git a/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-index 596308b83ef30471d8ab60fdc6065480909d6271..3672800b18e0b54b32c1b691c59dc4d127213e48 100644
+index 7c814236923319f41de9abd5cbc12f95ce95b525..3c5b1b91f066110b3535210e9bbb1b139c1783a0 100644
 --- a/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 +++ b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 @@ -442,6 +442,8 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
@@ -17,4 +17,4 @@ index 596308b83ef30471d8ab60fdc6065480909d6271..3672800b18e0b54b32c1b691c59dc4d1
 +    GoalKey<Zombie> ZOMBIE_ATTACK_VILLAGER = GoalKey.of(Zombie.class, NamespacedKey.minecraft("zombie_attack_villager"));
      // Purpur end
 
-     private static <T extends Mob> @NotNull GoalKey<T> create(final @NotNull String key,
+     private static <T extends Mob> @NonNull GoalKey<T> create(final @NonNull String key,

patches/generated-api/0004-Rabid-Wolf-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Rabid Wolf API
 
 
 diff --git a/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-index 3672800b18e0b54b32c1b691c59dc4d127213e48..37da5e3ae1349c5406e7c700d9f6174657a807d5 100644
+index 3c5b1b91f066110b3535210e9bbb1b139c1783a0..3e5b701a6fb2b8a89a61221f3e68b65547a0717f 100644
 --- a/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 +++ b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 @@ -444,6 +444,7 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
@@ -15,4 +15,4 @@ index 3672800b18e0b54b32c1b691c59dc4d127213e48..37da5e3ae1349c5406e7c700d9f61746
 +    GoalKey<Wolf> AVOID_RABID_WOLF = GoalKey.of(Wolf.class, NamespacedKey.minecraft("avoid_rabid_wolf"));
      // Purpur end
 
-     private static <T extends Mob> @NotNull GoalKey<T> create(final @NotNull String key,
+     private static <T extends Mob> @NonNull GoalKey<T> create(final @NonNull String key,

patches/generated-api/0005-Iron-golem-poppy-calms-anger.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Iron golem poppy calms anger
 
 
 diff --git a/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-index 37da5e3ae1349c5406e7c700d9f6174657a807d5..3e41a4141095bce989c75e989293deb3f47e8e6d 100644
+index 3e5b701a6fb2b8a89a61221f3e68b65547a0717f..2718c0e5061838b01881bb231c53f4da348adce3 100644
 --- a/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 +++ b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 @@ -445,6 +445,7 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
@@ -15,4 +15,4 @@ index 37da5e3ae1349c5406e7c700d9f6174657a807d5..3e41a4141095bce989c75e989293deb3
 +    GoalKey<IronGolem> RECEIVE_FLOWER = GoalKey.of(IronGolem.class, NamespacedKey.minecraft("receive_flower"));
      // Purpur end
 
-     private static <T extends Mob> @NotNull GoalKey<T> create(final @NotNull String key,
+     private static <T extends Mob> @NonNull GoalKey<T> create(final @NonNull String key,

patches/server/0008-Component-related-conveniences.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Component related conveniences
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index ce09c4900aee5a75c0d13a7bffd97a0711ead774..37adf5d3c6248547d830248714f32dbec653d653 100644
+index cb25a8796dda84fb08865a2af769fb4d10597685..ffc7f4f4544df21b713b780eded8aeba4090db52 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2005,6 +2005,26 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
+@@ -2004,6 +2004,26 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
          this.lastSentExp = -1; // CraftBukkit - Added to reset
      }
 

patches/server/0009-Ridables.patch

@@ -46,7 +46,7 @@ index 5a9712de8abe3c3ccd08c5699f89e3ce54b1f28d..13541b8d94981705bd32fdd8d8e9c170
      public LevelChunk getChunkIfLoaded(int x, int z) {
          return this.chunkSource.getChunkAtIfLoadedImmediately(x, z); // Paper - Use getChunkIfLoadedImmediately
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 37adf5d3c6248547d830248714f32dbec653d653..f21573f92d6703d74203b205aa2aebd0588a12e7 100644
+index ffc7f4f4544df21b713b780eded8aeba4090db52..6cad742f0141ac0e4b4b5a1dd07874eb7588e70f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -805,6 +805,15 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -66,10 +66,10 @@ index 37adf5d3c6248547d830248714f32dbec653d653..f21573f92d6703d74203b205aa2aebd0
 
      private void updatePlayerAttributes() {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 74214676417ec488b47c456b718d62ac656eb820..2ebb436200ebf3655165800cb69233756cbe475f 100644
+index 301dc8ea0574f02f28067cda397683c7e7a6152f..ff97005181c2b55ffb2be6d19f27b34f26a2e20c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2718,6 +2718,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2713,6 +2713,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
 
                              ServerGamePacketListenerImpl.this.cserver.getPluginManager().callEvent(event);
 
@@ -190,7 +190,7 @@ index 09fdea983772612ef3fff6b2da3cf469a34e4ec0..aa76a24421cdb3908a3544d92eb3d1e3
      protected ParticleOptions getInkParticle() {
          return ParticleTypes.GLOW_SQUID_INK;
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 7b54a43ba411b787c0bf522d111da10aea1715f6..a4f2e5bb14ef28191a4955578e43ee856ab924b1 100644
+index ce0d28cafcae0b7edc861749a1652ecc08d298b5..e7b9f129a31c57df65e9be082de1d2f31a327599 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -236,9 +236,9 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -5122,10 +5122,10 @@ index cd789c235acf740ec29c30b180e7fbe1a140caa9..edaaaf0ecc412504b32fe7481f95e594
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 0ab53d46f0b8f3f3791dd01766738522c86932e8..ba749cf277aad319709e3da550155488bb33591b 100644
+index 8dd85b9ca3b3e3429de4d0ec0654982589c6e93e..8c1fdda7c30c12bc5262d373474deb6930e811e8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -597,6 +597,15 @@ public class CraftEventFactory {
+@@ -601,6 +601,15 @@ public class CraftEventFactory {
          // Paper end
          craftServer.getPluginManager().callEvent(event);
 
@@ -5141,7 +5141,7 @@ index 0ab53d46f0b8f3f3791dd01766738522c86932e8..ba749cf277aad319709e3da550155488
          return event;
      }
 
-@@ -1187,6 +1196,7 @@ public class CraftEventFactory {
+@@ -1191,6 +1200,7 @@ public class CraftEventFactory {
          EntityDamageEvent event;
          if (damager != null) {
              event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), damagee.getBukkitEntity(), cause, bukkitDamageSource, modifiers, modifierFunctions, critical);

patches/server/0013-AFK-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] AFK API
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index f21573f92d6703d74203b205aa2aebd0588a12e7..585b41a7e890aa6b5ea27f8fb84a8ca0310ddeb6 100644
+index 6cad742f0141ac0e4b4b5a1dd07874eb7588e70f..fe0bbaec0a47305da244bbca7b9ce64015ea39b8 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2368,8 +2368,68 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
+@@ -2367,8 +2367,68 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
 
      public void resetLastActionTime() {
          this.lastActionTime = Util.getMillis();
@@ -78,7 +78,7 @@ index f21573f92d6703d74203b205aa2aebd0588a12e7..585b41a7e890aa6b5ea27f8fb84a8ca0
          return this.stats;
      }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2ebb436200ebf3655165800cb69233756cbe475f..6ce6e9c4cee198c9057e5aa2ae8849a69e81fea7 100644
+index ff97005181c2b55ffb2be6d19f27b34f26a2e20c..cb9efbba91510d90fa4a7dbe01fa6e9ba8206612 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -332,6 +332,20 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -124,7 +124,7 @@ index 2ebb436200ebf3655165800cb69233756cbe475f..6ce6e9c4cee198c9057e5aa2ae8849a6
                      Location oldTo = to.clone();
                      PlayerMoveEvent event = new PlayerMoveEvent(player, from, to);
                      this.cserver.getPluginManager().callEvent(event);
-@@ -1455,7 +1477,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1450,7 +1472,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                                      movedWrongly = true;
                                      if (event.getLogWarning())
                                  // Paper end
@@ -133,7 +133,7 @@ index 2ebb436200ebf3655165800cb69233756cbe475f..6ce6e9c4cee198c9057e5aa2ae8849a6
                                  } // Paper
                              }
 
-@@ -1513,6 +1535,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1508,6 +1530,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                                      this.lastYaw = to.getYaw();
                                      this.lastPitch = to.getPitch();
 
@@ -223,7 +223,7 @@ index 141b748abe80402731cdaf14a3d36aa7cef4f4bd..d5d2a6467b48bcf8e5322dd5938f6e4f
                  if (range < 0.0 || d < range * range) {
                      return true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index c2e0baa40e556fd8bb2ae406b321da01f1d05079..1faf1c4b777333030d164e277ee3552900f10cd3 100644
+index 39bb873b5207e83aef36dbf362079eaff31fbb9e..263c4fd61219bb151d9b58fac5d5a75a3dae7029 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -576,10 +576,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {