Updated Upstream (Purpur)

gradle.properties

@@ -4,7 +4,7 @@ version = 1.21.1-R0.1-SNAPSHOT
 mcVersion = 1.21.1
 
 # Upstream commit
-purpurCommit = fdfc12e8c70874dd6b438dfb1d77b87dbcebb0c9
+purpurCommit = 8af4ea6f4637c5aaeeaf10791f2715324b5ccf38
 
 # Gradle
 org.gradle.caching = true

patches/api/0016-Injecting-custom-Materials.patch

@@ -83,18 +83,18 @@ index 0000000000000000000000000000000000000000..d506e6bb0b2c88ffb4e9274672bf8ee4
 +
 +}
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 724e64a8ff978456c101a97432e45f234e349926..af332799ef469e87736e134bc35c0557d9029b72 100644
+index c7fa497381c5c5d57fda8b9c1ef26f2e89523f66..4a2a11c749e03cc15a3eb1612dc0883c0b54b6ec 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -4621,6 +4621,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -4623,6 +4623,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
      public final Class<?> data;
      private final boolean legacy;
      private final NamespacedKey key;
 +    private final boolean injected = false; // Kiterino - Injecting custom Materials
 
      private Material(final int id) {
          this(id, 64);
-@@ -4777,6 +4778,12 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -4779,6 +4780,12 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
       * @return Maximum stack size for this material
       */
      public int getMaxStackSize() {
@@ -107,7 +107,7 @@ index 724e64a8ff978456c101a97432e45f234e349926..af332799ef469e87736e134bc35c0557
          return maxStack;
      }
 
-@@ -4786,6 +4793,12 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -4788,6 +4795,12 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
       * @return Maximum durability for this material
       */
      public short getMaxDurability() {
@@ -120,7 +120,7 @@ index 724e64a8ff978456c101a97432e45f234e349926..af332799ef469e87736e134bc35c0557
          return durability;
      }
 
-@@ -4964,6 +4977,11 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -4966,6 +4979,11 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
          if (filtered.startsWith(NamespacedKey.MINECRAFT + ":")) {
              filtered = filtered.substring((NamespacedKey.MINECRAFT + ":").length());
          }
@@ -132,7 +132,7 @@ index 724e64a8ff978456c101a97432e45f234e349926..af332799ef469e87736e134bc35c0557
 
          filtered = filtered.toUpperCase(Locale.ROOT);
 
-@@ -5659,4 +5677,16 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -5661,4 +5679,16 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
          }
      }
      // Purpur end

patches/server/0007-Init-Kiterino-configs.patch

@@ -59,7 +59,7 @@ index 26fbc981ec9acafc7ba1753759375c142261b6ab..f9930a257f8034a07ffc78c389cee864
          this.generator = gen;
          this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7443279fd48bd1b9dc0135e996dbc6fa2d584b54..2020e2133f9ddf4ff8b4ce3fe1c9b1d7f5908bad 100644
+index 479a8422a6786a8ada8536d528e7f57a06c8107a..b1d874edfdb95c758a518a37fae04462c0c85fae 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1085,6 +1085,8 @@ public final class CraftServer implements Server {
@@ -71,7 +71,7 @@ index 7443279fd48bd1b9dc0135e996dbc6fa2d584b54..2020e2133f9ddf4ff8b4ce3fe1c9b1d7
          for (ServerLevel world : this.console.getAllLevels()) {
              // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
              world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
-@@ -3069,6 +3071,13 @@ public final class CraftServer implements Server {
+@@ -3066,6 +3068,13 @@ public final class CraftServer implements Server {
          }
          // Purpur end
 

patches/server/0009-Red-tint-API.patch

@@ -42,10 +42,10 @@ index 802de2ff74b490ea73c415739375a0169fce9f2f..f191e86c6d3a76225be95914ba521492
          this.oldSize = buf.readDouble();
          this.newSize = buf.readDouble();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 37fc08d04ff3514d27ad25c8d774a6e96b30c3b1..4df2c368cb9cd15017e8072a5f306a93c06ed189 100644
+index ceca8c1bb41a9c258f004863ea8ff76961e6b4f0..7d82ba7b17482f28b6a060c7a94945ed9b6f89e8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3649,4 +3649,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3648,4 +3648,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.getHandle().connection.send(new net.minecraft.network.protocol.game.ClientboundPlayerCombatKillPacket(getEntityId(), io.papermc.paper.adventure.PaperAdventure.asVanilla(message)));
      }
      // Purpur end

patches/server/0018-Data-driven-items.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Data-driven items
 
 
 diff --git a/src/main/java/io/papermc/paper/registry/PaperRegistries.java b/src/main/java/io/papermc/paper/registry/PaperRegistries.java
-index 6ec9d9b9acf557aa2ebf39d38a14225b0205fae1..7603395aace52f16453de854b95f2f8ca691c573 100644
+index 98b096339fe48b2fc8169ae0376e05d59236fc9a..aac4192aa369ce5c1a59cdc01d1baec6034011e8 100644
 --- a/src/main/java/io/papermc/paper/registry/PaperRegistries.java
 +++ b/src/main/java/io/papermc/paper/registry/PaperRegistries.java
-@@ -75,7 +75,7 @@ public final class PaperRegistries {
+@@ -77,7 +77,7 @@ public final class PaperRegistries {
              entry(Registries.MOB_EFFECT, RegistryKey.MOB_EFFECT, PotionEffectType.class, CraftPotionEffectType::new),
              entry(Registries.STRUCTURE_TYPE, RegistryKey.STRUCTURE_TYPE, StructureType.class, CraftStructureType::new),
              entry(Registries.BLOCK, RegistryKey.BLOCK, BlockType.class, CraftBlockType::new),

patches/server/0021-Data-driven-mob-effects.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Data-driven mob effects
 
 
 diff --git a/src/main/java/io/papermc/paper/registry/PaperRegistries.java b/src/main/java/io/papermc/paper/registry/PaperRegistries.java
-index 7603395aace52f16453de854b95f2f8ca691c573..0a4dc6627c1b02f2569305c668130b4802d506be 100644
+index aac4192aa369ce5c1a59cdc01d1baec6034011e8..c1663ecd1fe46529e7e9ce50a52112ab16611d57 100644
 --- a/src/main/java/io/papermc/paper/registry/PaperRegistries.java
 +++ b/src/main/java/io/papermc/paper/registry/PaperRegistries.java
-@@ -72,7 +72,7 @@ public final class PaperRegistries {
+@@ -74,7 +74,7 @@ public final class PaperRegistries {
              // built-ins
              writable(Registries.GAME_EVENT, RegistryKey.GAME_EVENT, GameEvent.class, CraftGameEvent::new, PaperGameEventRegistryEntry.PaperBuilder::new),
              entry(Registries.INSTRUMENT, RegistryKey.INSTRUMENT, MusicInstrument.class, CraftMusicInstrument::new),

patches/server/0030-EMC-Allow-Vehicle-Passenger-Teleporting-for-Bukkit-A.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] EMC - Allow Vehicle/Passenger Teleporting for Bukkit API
 If Bukkit teleport is called, teleport the whole set of entities together and maintain the chain.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index ce549ad8aed721664df0929a4de197929dc565d1..98204f901ebb63e2970b036dc5b6bd7512dd6c8b 100644
+index 09f526145d80ece5466362c60df882e8a004de53..424390bc806315687ff6f79cd15e245e7f0f9706 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -813,7 +813,7 @@ public abstract class PlayerList {
@@ -19,7 +19,7 @@ index ce549ad8aed721664df0929a4de197929dc565d1..98204f901ebb63e2970b036dc5b6bd75
          this.playersByName.remove(entityplayer.getScoreboardName().toLowerCase(java.util.Locale.ROOT)); // Spigot
          entityplayer.serverLevel().removePlayerImmediately(entityplayer, entity_removalreason);
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index cd9c1b07d275c6218a9c0239e6625ad430abcef9..d91aef1bb668e87998b4270ecf2a3e730cb9929f 100644
+index a945ef10f1f5941cf86fe2fad157023a2cbd02f5..c65fa74644b89d09e7f1aed30d27799b428ede3b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -309,7 +309,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -162,10 +162,10 @@ index adc7ae901f217b9b68a92c849390af8e51074f73..6c3171f6c6a73e42ed31f564bcd4f3d5
      }
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 4df2c368cb9cd15017e8072a5f306a93c06ed189..3332e85257aad8bab8a75bb949f63f9d836bf8ca 100644
+index 7d82ba7b17482f28b6a060c7a94945ed9b6f89e8..77e44b2b9260faa5b6caa2f43a0e45134b2a4665 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1435,13 +1435,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1434,13 +1434,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          Preconditions.checkArgument(location.getWorld() != null, "location.world");
          // Paper start - Teleport passenger API
          // Don't allow teleporting between worlds while keeping passengers
@@ -181,15 +181,15 @@ index 4df2c368cb9cd15017e8072a5f306a93c06ed189..3332e85257aad8bab8a75bb949f63f9d
              return false;
          }
          // Paper end
-@@ -1496,6 +1496,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1495,6 +1495,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              this.getHandle().closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.TELEPORT); // Paper - Inventory close reason
          }
 
 +        this.detachEntities(); // EMC
          // Check if the fromWorld and toWorld are the same.
          if (fromWorld == toWorld) {
              // Paper start - Teleport API
-@@ -1510,9 +1511,22 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1509,9 +1510,22 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              // The respawn reason should never be used if the passed location is non null.
              this.server.getHandle().respawn(entity, true, Entity.RemovalReason.CHANGED_DIMENSION, null, to);
          }

patches/server/0036-More-resource-pack-API.patch

@@ -27,10 +27,10 @@ index 9ebe1f1797b5be562bc4f6d92b9a4d6022ca2151..d21fbd8c80120441df4b11faceb0b897
              return Optional.empty();
          } else {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2020e2133f9ddf4ff8b4ce3fe1c9b1d7f5908bad..b342496a5871a9d62a303bbabc3074b7e62b58b9 100644
+index b1d874edfdb95c758a518a37fae04462c0c85fae..c5f3f9a282cbb6ae4cefc7cf3ffef5d731cfe400 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -3318,4 +3318,20 @@ public final class CraftServer implements Server {
+@@ -3315,4 +3315,20 @@ public final class CraftServer implements Server {
          return getServer().lagging;
      }
      // Purpur end