rebase

build.gradle.kts

@@ -3,7 +3,7 @@ import io.papermc.paperweight.util.constants.*
 plugins {
     java
     `maven-publish`
-    id("com.github.johnrengelman.shadow") version "7.1.0" apply false
+    id("com.github.johnrengelman.shadow") version "7.1.0"
     id("io.papermc.paperweight.patcher") version "1.3.0-SNAPSHOT"
 }
 
@@ -17,7 +17,7 @@ repositories {
 dependencies {
     remapper("net.fabricmc:tiny-remapper:0.7.0:fat")
     decompiler("net.minecraftforge:forgeflower:1.5.498.22")
-    paperclip("io.papermc:paperclip:2.0.1")
+    paperclip("io.papermc:paperclip:3.0.2-SNAPSHOT")
 }
 
 subprojects {
@@ -25,8 +25,6 @@ subprojects {
     apply(plugin = "maven-publish")
 
     java {
-        sourceCompatibility = JavaVersion.VERSION_16
-        targetCompatibility = JavaVersion.VERSION_16
         toolchain {
             languageVersion.set(JavaLanguageVersion.of(17))
         }

gradle.properties

@@ -4,7 +4,7 @@ version = 1.18-rc3-R0.1-SNAPSHOT
 mcVersion = 1.18-rc3
 packageVersion = 1_18_R1
 
-paperCommit = 6876364b77727f2b19cc2cd983c5207c51301e4d
+paperCommit = 0fe06138210e9ed90439ef27eb7ed8af4d39fb13
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/api/0001-Build-System-Changes.patch

@@ -6,14 +6,14 @@ Subject: [PATCH] Build System Changes
 todo: merge with rebrand patch
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 720ba2774196f24cca6c4d1b173f90f8151c8a5e..c5d5bd6e4e074b9290a37c5a5c5957936ed346f6 100644
+index 241ee5c98275a4517e040c86355ae6702f8efca1..43ce7fe6b65488d00c69986908c788761ccd74ad 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -37,6 +37,7 @@ dependencies {
+@@ -40,6 +40,7 @@ dependencies {
      apiAndDocs("net.kyori:adventure-text-serializer-plain")
-     api("org.apache.logging.log4j:log4j-api:2.14.1") // Paper
+     api("org.apache.logging.log4j:log4j-api:2.14.1")
-     api("org.slf4j:slf4j-api:1.7.30") // Paper
+     api("org.slf4j:slf4j-api:1.8.0-beta4")
 +    api("net.kyori:adventure-text-minimessage:4.1.0-SNAPSHOT") // Purpur
  
-     implementation("org.ow2.asm:asm:9.1")
+     implementation("org.ow2.asm:asm:9.2")
-     implementation("org.ow2.asm:asm-commons:9.1")
+     implementation("org.ow2.asm:asm-commons:9.2")

patches/api/0003-Purpur-client-support.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Purpur client support
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 5d928c5e82033dd812d406fce7353fd4824195c0..8189fe28d692608b78c7861f0202d2ba17587de9 100644
+index bdb830942b7751bfcce36583ffd59488473f2db8..ccd12268d9c1b2c889a68735831a9b26a80dbf53 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2298,4 +2298,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2331,4 +2331,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @Override
      Spigot spigot();
      // Spigot end

patches/api/0008-AFK-API.patch

@@ -81,10 +81,10 @@ index 0000000000000000000000000000000000000000..0c8b3e5e4ba412624357ea5662a78862
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 8189fe28d692608b78c7861f0202d2ba17587de9..252d848393525da36378148d9698cc05a39d8d11 100644
+index ccd12268d9c1b2c889a68735831a9b26a80dbf53..af0c24d79251ba032b8ca3051fb451b00a5986e4 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2306,5 +2306,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2339,5 +2339,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @return True if Player uses Purpur Client
       */
      public boolean usesPurpurClient();

patches/api/0015-Player-invulnerabilities.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Player invulnerabilities
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 252d848393525da36378148d9698cc05a39d8d11..18eb516f3fbe29df9b4e81d3969d6c3fee799dd7 100644
+index af0c24d79251ba032b8ca3051fb451b00a5986e4..1010232accc7cb0052dade56e7366d90179d7f93 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2325,5 +2325,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2358,5 +2358,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * Reset the idle timer back to 0
       */
      void resetIdleTimer();

patches/api/0027-Fix-javadoc-warnings-missing-param-and-return.patch

@@ -921,10 +921,10 @@ index a6a7429ed2e1eefb2b12b7480ed74fcc3963a864..e8027e1d505dda6effbb1698550016e8
  
          NORMAL(false),
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 18eb516f3fbe29df9b4e81d3969d6c3fee799dd7..ef9a545f71a2a5ee37b188355d789705f928280e 100644
+index 1010232accc7cb0052dade56e7366d90179d7f93..b17e9e446aafc029d70b45fd7879d77cc82d8359 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2128,6 +2128,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2161,6 +2161,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      void resetCooldown();
  
      /**
@@ -933,7 +933,7 @@ index 18eb516f3fbe29df9b4e81d3969d6c3fee799dd7..ef9a545f71a2a5ee37b188355d789705
       * @return the client option value of the player
       */
      @NotNull
-@@ -2159,6 +2161,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2192,6 +2194,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      // Paper end
  
      // Spigot start

patches/api/0031-Conflict-on-change-for-adventure-deprecations.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Conflict on change for adventure deprecations
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index a8fc16f2fa6713a4cbe75c17a8e6743f69c383d5..167d8fa9f8cb5ee67149da3b9b63c613668f20b0 100644
+index 365bb7c092cf7f008ba376ae3b511d69431a28f7..4ef8c75df64e670c55f13efaa69651fd636d5f12 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -370,7 +370,7 @@ public final class Bukkit {
@@ -170,7 +170,7 @@ index c8d37184d8e882a4084a1bfef85faa330588600b..46bae5c13ce2b973b114682f6a338981
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index fb4d5be0a972a5a8d441a628d796d6ada86cfe79..2b2c36e950f1518c795208157f52211a2e93f467 100644
+index b17e9e446aafc029d70b45fd7879d77cc82d8359..ba1894762ede0af3ba18a4105e12e241139ba65d 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -75,7 +75,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -281,7 +281,7 @@ index fb4d5be0a972a5a8d441a628d796d6ada86cfe79..2b2c36e950f1518c795208157f52211a
      public void sendSignChange(@NotNull Location loc, @Nullable String[] lines, @NotNull DyeColor dyeColor) throws IllegalArgumentException;
  
      /**
-@@ -1863,7 +1863,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1896,7 +1896,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @deprecated in favour of {@link #locale()}
       */
      @NotNull

patches/api/0035-Flying-Fall-Damage-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Flying Fall Damage API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 15243abfcbebb0219cabbf56a18910da2f1a027a..ada1063772875d02321cefead55a054efc4369c0 100644
+index ba1894762ede0af3ba18a4105e12e241139ba65d..15160d8999665c2dce77bfcd44630247a2377ede 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2351,5 +2351,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2384,5 +2384,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param invulnerableTicks Invulnerable ticks remaining
       */
      void setSpawnInvulnerableTicks(int invulnerableTicks);

patches/api/0040-Add-force-and-prompt-parameters-to-resource-pack-api.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add force and prompt parameters to resource pack api
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index d4f66b338ecfe8c1bdcd8f5763e61539923c7efc..40f56815ecee852582b5ed5a86393bee69d90b91 100644
+index 15160d8999665c2dce77bfcd44630247a2377ede..0cbf3ba84da691ad5be6d36820e72a6d9f58cfbc 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1486,6 +1486,88 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1519,6 +1519,88 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void setResourcePack(@NotNull String url, @NotNull byte[] hash);
  

patches/server/0002-Rebrand.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 72e4828940396b7b326ed64c3c06b785f949b08d..c103a602c9369f959da4a99edcf9f067d2672257 100644
+index cd74406039704e5a880f00b9b60bb7b1dedc5398..034d1058c7a7c1ed1a4a2c7ac23ec00f72ac63dd 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -18,8 +18,8 @@ repositories {
@@ -19,7 +19,7 @@ index 72e4828940396b7b326ed64c3c06b785f949b08d..c103a602c9369f959da4a99edcf9f067
      // Paper start
      implementation("org.jline:jline-terminal-jansi:3.21.0")
      implementation("net.minecrell:terminalconsoleappender:1.3.0")
-@@ -53,6 +53,8 @@ dependencies {
+@@ -49,6 +49,8 @@ dependencies {
          isTransitive = false
      }
      // Paper end
@@ -28,7 +28,7 @@ index 72e4828940396b7b326ed64c3c06b785f949b08d..c103a602c9369f959da4a99edcf9f067
  
      testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
      testImplementation("junit:junit:4.13.1")
-@@ -71,7 +73,7 @@ tasks.jar {
+@@ -67,7 +69,7 @@ tasks.jar {
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",
@@ -37,7 +37,7 @@ index 72e4828940396b7b326ed64c3c06b785f949b08d..c103a602c9369f959da4a99edcf9f067
              "Implementation-Vendor" to date, // Paper
              "Specification-Title" to "Bukkit",
              "Specification-Version" to project.version,
-@@ -162,7 +164,7 @@ fun TaskContainer.registerRunTask(
+@@ -158,7 +160,7 @@ fun TaskContainer.registerRunTask(
      name: String,
      block: JavaExec.() -> Unit
  ): TaskProvider<JavaExec> = register<JavaExec>(name) {
@@ -113,10 +113,10 @@ index e0b1f0671d16ddddcb6725acd25a1d1d69e42701..8c3c68465197fafc14849dc38a572e30
                  .completer(new ConsoleCommandCompleter(this.server))
                  .option(LineReader.Option.COMPLETE_IN_WORD, true);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 519806cee3a45eaaedefa83b7237b073c9bbc332..1f3f93485f8ceab2f8d2601a952414b993ace6a3 100644
+index 893badbe321fa974cb82f5f11ab590bb3827f8b8..f1fbd740706fd0679643be466bf5fa4905dbe453 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1707,7 +1707,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1708,7 +1708,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @DontObfuscate
      public String getServerModName() {
@@ -145,7 +145,7 @@ index 38a0fb9a7c4ade9cacfd30dffabfea7e6b773981..fd3d3e22613511a42f7fc343079b081c
              // Spigot end
              DedicatedServer.LOGGER.warn("To change this, set \"online-mode\" to \"true\" in the server.properties file.");
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6b53310b37a502a677459bf2b777a2c450fb6482..14cbc2a71b5587cd8f6df897a017afeb4e4ec017 100644
+index 1d7d3dbf7f6857d9853112844b70692e92e9c89d..77984134e53755caf45b8217a912ef0df645de59 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -255,7 +255,7 @@ import javax.annotation.Nullable; // Paper

patches/server/0003-Purpur-config-files.patch

@@ -85,20 +85,20 @@ index fd3d3e22613511a42f7fc343079b081c72ff3f61..fe029ec70afad56bb7a7361f347e9b9a
          io.papermc.paper.util.ObfHelper.INSTANCE.getClass(); // load mappings for stacktrace deobf and etc.
          io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 929f48675a10fdd64cb351305389d680a16963fb..73ebe9d8da0dbfb9d4d8f041d8b911d4931f3d04 100644
+index c2220d5157d3065a256cd17410760c6aedf24987..476c60176f10ad656c6c0676f8d43f7ae8104430 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -168,6 +168,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -169,6 +169,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
- 
      public final com.destroystokyo.paper.PaperWorldConfig paperConfig; // Paper
+     public final com.destroystokyo.paper.antixray.ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray
  
 +    public final net.pl3x.purpur.PurpurWorldConfig purpurConfig; // Purpur
 +
      public final co.aikar.timings.WorldTimingsHandler timings; // Paper
      public static BlockPos lastPhysicsProblem; // Spigot
      private org.spigotmc.TickLimiter entityLimiter;
-@@ -310,6 +312,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -311,6 +313,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-     protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, final DimensionType dimensionmanager, Supplier<ProfilerFiller> supplier, boolean flag, boolean flag1, long i, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env) {
+     protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, final DimensionType dimensionmanager, Supplier<ProfilerFiller> supplier, boolean flag, boolean flag1, long i, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.concurrent.Executor executor) { // Paper - Async-Anti-Xray - Pass executor
          this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
          this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName(), this.spigotConfig); // Paper
 +        this.purpurConfig = new net.pl3x.purpur.PurpurWorldConfig((ServerLevel) this, ((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName(), env); // Purpur
@@ -444,7 +444,7 @@ index 0000000000000000000000000000000000000000..6e7f56fe2b78d7a09d5d130f2c88338f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 14cbc2a71b5587cd8f6df897a017afeb4e4ec017..a59270a4702ae7d567e9c4e425b1793e6d50c4c8 100644
+index 77984134e53755caf45b8217a912ef0df645de59..e08b48b13ee40c701094c897b50c08dd64b6d31a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -933,6 +933,7 @@ public final class CraftServer implements Server {

patches/server/0004-Purpur-client-support.patch

@@ -43,10 +43,10 @@ index 3eba6962040f33b7b31b16c9de22d90f225710b4..23074f0b00cde60e3a42335c7aa3eb4f
              try {
                  byte[] data = new byte[packet.data.readableBytes()];
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 2ebeb2ab175cd93f7adc9f4ed923831e37481b8f..d6f92c60eb6f0507466c4d2941f3ef02fa58b1cc 100644
+index ad15c4c20ae9e1858a2b914b0a1aa91ec1d7a012..8a1cdd256ab8496b9a8e34bf891c1001b2cee082 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2538,4 +2538,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2563,4 +2563,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.spigot;
      }
      // Spigot end

patches/server/0006-Ridables.patch

@@ -22,10 +22,10 @@ index 14610e6144ec144ebbec6fb0945c67bb0ea86795..6833eb5dc7aa64bef1b3b38de5e282bd
          super(x, y, z);
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1f3f93485f8ceab2f8d2601a952414b993ace6a3..592ad9d2f5f1651ccc88032b0c530ae6b1dab8af 100644
+index f1fbd740706fd0679643be466bf5fa4905dbe453..5072cb76e0793ee6c47800628daa65906bde8577 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1585,6 +1585,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1586,6 +1586,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              ServerLevel worldserver = (ServerLevel) iterator.next();
              worldserver.hasPhysicsEvent =  org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
              worldserver.hasEntityMoveEvent =  io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
@@ -34,7 +34,7 @@ index 1f3f93485f8ceab2f8d2601a952414b993ace6a3..592ad9d2f5f1651ccc88032b0c530ae6
  
              this.profiler.push(() -> {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 53c3b1abc1acf0b847fa2e52b9941bd003971342..20321bf08e3c42c7f8f4879c38d60220505fad5a 100644
+index f055d25394d20afb208e8612fb31d77af141876b..d4d8c93f0fe85ce30e153646e69973f1119700f3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -208,6 +208,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -4461,7 +4461,7 @@ index 642279bb7e15db9f662094ffd6ded2e3c7af3fd6..ab648e7dafd78f414646cef96b422e87
                      this.setTradingPlayer(player);
                      this.openTradingScreen(player, this.getDisplayName(), 1);
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 4e6364bea8f464bef690b8cc8f25a80ee699ed5a..24b9343a2dedbbe6aad4048e5a05ae6e610ad5ba 100644
+index 2c00a766130a7f682fc6c4c74321e10637ca7932..7eae138f3bbddd44c078b2fbcb5d5fd07d5bd9aa 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -191,6 +191,19 @@ public abstract class Player extends LivingEntity {

patches/server/0011-AFK-API.patch

@@ -182,7 +182,7 @@ index a7575b5ef56af6f53448d391abb4956e130148ca..0a9e4dc5d6d567605c587df9bcbb57d3
              if (baseEntity == null) {
                  if (this.isCombat && (!targetEntity.canBeSeenAsEnemy() || targetEntity.level.getDifficulty() == Difficulty.PEACEFUL)) {
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 24b9343a2dedbbe6aad4048e5a05ae6e610ad5ba..adc094f20ed8bb4c531b06eb2e78bebd3faff578 100644
+index 7eae138f3bbddd44c078b2fbcb5d5fd07d5bd9aa..46932d899db4050e6f7e55caaced409663330446 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -194,6 +194,13 @@ public abstract class Player extends LivingEntity {
@@ -263,7 +263,7 @@ index 20215510857b8e49ea0c93d35eddfbad7cd355b0..996171e7271e62e72c0b2b213c21caf5
      public boolean untamedTamablesAreRidable = true;
      public boolean useNightVisionWhenRiding = false;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d6f92c60eb6f0507466c4d2941f3ef02fa58b1cc..28b70bb4c0d15334a877840c7ec3fbb6967d5729 100644
+index 8a1cdd256ab8496b9a8e34bf891c1001b2cee082..3e898377b259eb9176772b70a4f3a1b14d0dca91 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -428,10 +428,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -283,7 +283,7 @@ index d6f92c60eb6f0507466c4d2941f3ef02fa58b1cc..28b70bb4c0d15334a877840c7ec3fbb6
          for (ServerPlayer player : (List<ServerPlayer>) server.getHandle().players) {
              if (player.getBukkitEntity().canSee(this)) {
                  player.connection.send(new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.UPDATE_DISPLAY_NAME, this.getHandle()));
-@@ -2544,5 +2549,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2569,5 +2574,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public boolean usesPurpurClient() {
          return getHandle().purpurClient;
      }

patches/server/0013-Configurable-server-mod-name.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable server mod name
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 592ad9d2f5f1651ccc88032b0c530ae6b1dab8af..b5a307f00f92a640b13c60f6ebee204223c0d9e2 100644
+index 5072cb76e0793ee6c47800628daa65906bde8577..e140e58b9444573089cda145c7957a2df0b2bd75 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1708,7 +1708,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1709,7 +1709,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @DontObfuscate
      public String getServerModName() {

patches/server/0018-Player-invulnerabilities.patch

@@ -108,7 +108,7 @@ index c1bbe2786b98649ae7882a05070f2bdad813d7b4..621f0f75096c89bd050f7e0ede8abcb1
          this.cserver.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(this.getCraftPlayer(), packStatus)); // CraftBukkit
          // Paper end
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 986db30e5f8313d57345e16a793a22b426e2ecfa..1ef7d23da7057b3a1f8498201ab6a952ddc3788f 100644
+index 48e78e76d23cc6aff00a1526d53581deebec4c1d..fe1ad78a41d01feaf64b64d0b8585e23d36927bc 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -993,6 +993,8 @@ public abstract class PlayerList {
@@ -143,10 +143,10 @@ index 996171e7271e62e72c0b2b213c21caf53c815e97..8e9ba3a8582c8e5d1e14bf3bfa8ecfce
  
      public boolean babiesAreRidable = true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 28b70bb4c0d15334a877840c7ec3fbb6967d5729..10affdc93c75b1b2e4e6966201bd9da353178573 100644
+index 3e898377b259eb9176772b70a4f3a1b14d0dca91..2069a834aaab46486025285b97dbb56d30e506a8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2564,5 +2564,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2589,5 +2589,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void resetIdleTimer() {
          getHandle().resetLastActionTime();
      }

patches/server/0068-Item-entity-immunities.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Item entity immunities
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 7c4154b1b5ccc53af5f5fb186c2a5d1ff88c7af1..29f9db14f1bc89b544635b0c4932e84ebc6805ab 100644
+index 42b4292152d4b17c49c9cc1f488abf892a4883a5..577c2e83437a6330586ef16038c9f6e54cca664b 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -2246,7 +2246,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -2251,7 +2251,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
  
      public class TrackedEntity {
  

patches/server/0077-Add-allow-water-in-end-world-option.patch

@@ -27,10 +27,10 @@ index b5a5c56fbb66c17dd2e2d1f4d69d2b1826cd4951..c6a141f220ac2405a3f93ba6100b4bf3
  
                  return true;
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 73ebe9d8da0dbfb9d4d8f041d8b911d4931f3d04..112078739e234ee7b676a499fe33e5b2f505526b 100644
+index 476c60176f10ad656c6c0676f8d43f7ae8104430..468a2cc47734bf7a406ab833ce145a35194f67ec 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -1493,4 +1493,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1496,4 +1496,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      public boolean shouldDelayFallingBlockEntityRemoval(Entity.RemovalReason reason) {
          return false;
      }

patches/server/0110-Add-adjustable-breeding-cooldown-to-config.patch

@@ -33,10 +33,10 @@ index 2bc77858b4a78e24227b4b096fd44177202d5292..b26d5482d89e28897bcc9dc8a15042a5
              entityageable.setBaby(true);
              entityageable.moveTo(this.getX(), this.getY(), this.getZ(), 0.0F, 0.0F);
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 112078739e234ee7b676a499fe33e5b2f505526b..f23ca62cc05f2e636462653ae78ddf5a387cc1c0 100644
+index 468a2cc47734bf7a406ab833ce145a35194f67ec..409baf096e9a9cfecc6159313d4f91b174577be3 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -187,6 +187,49 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -188,6 +188,49 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      }
      // Paper end - fix and optimise world upgrading
  
@@ -86,7 +86,7 @@ index 112078739e234ee7b676a499fe33e5b2f505526b..f23ca62cc05f2e636462653ae78ddf5a
      public CraftWorld getWorld() {
          return this.world;
      }
-@@ -313,6 +356,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -314,6 +357,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
          this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName(), this.spigotConfig); // Paper
          this.purpurConfig = new net.pl3x.purpur.PurpurWorldConfig((ServerLevel) this, ((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName(), env); // Purpur

patches/server/0124-Spread-out-and-optimise-player-list-ticksSpread-out-.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Spread out and optimise player list ticksSpread out and
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 5902bfd6b5d2a9df6bd60b53ad8ba14719f5bf81..f50f884430781ddf58bb2db13bf3982c8ec0a817 100644
+index 67c96235abd2eeba392e0400e2788c162e18f8de..84e5e35b002fc15a863a0969608d983165e95e65 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1007,22 +1007,22 @@ public abstract class PlayerList {
@@ -46,20 +46,20 @@ index 5902bfd6b5d2a9df6bd60b53ad8ba14719f5bf81..f50f884430781ddf58bb2db13bf3982c
  
      public void broadcastAll(Packet<?> packet) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 10affdc93c75b1b2e4e6966201bd9da353178573..5a0d709231ab7fffad60b8fba7f2f490535c8423 100644
+index 2069a834aaab46486025285b97dbb56d30e506a8..8eaaa5ef3a9c2a49e63f4c015738fc7ce7d3fd5c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1527,7 +1527,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1548,7 +1548,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
-     public boolean canSee(Player player) {
+     public boolean canSee(org.bukkit.entity.Entity entity) {
--        return !this.hiddenPlayers.containsKey(player.getUniqueId());
+-        return !this.hiddenEntities.containsKey(entity.getUniqueId());
 +        // Purpur start
-+        return canSee(player.getUniqueId());
++        return this.canSee(entity.getUniqueId());
 +    }
 +
 +    public boolean canSee(UUID uuid) {
-+        return !hiddenPlayers.containsKey(uuid);
++        return !this.hiddenEntities.containsKey(uuid);
 +        // Purpur end
      }
  

patches/server/0156-Sneak-to-bulk-process-composter.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Sneak to bulk process composter
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 17a59fba538f8a7bdd96964c6acda94b33655d27..390847272785067bf04a672e28eacc9136447057 100644
+index dd92cc53f0e6247508c6ce494dd45b4829344b2a..5565dfb30bd2609aded4c064ea6dfcabf71047e6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-@@ -578,7 +578,7 @@ public class ServerPlayerGameMode {
+@@ -580,7 +580,7 @@ public class ServerPlayerGameMode {
              boolean flag1 = player.isSecondaryUseActive() && flag;
              ItemStack itemstack1 = stack.copy();
  

patches/server/0161-Break-individual-slabs-when-sneaking.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Break individual slabs when sneaking
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 390847272785067bf04a672e28eacc9136447057..1351d83efdcab51d3898e1fb77d01b27975ce136 100644
+index 5565dfb30bd2609aded4c064ea6dfcabf71047e6..cd1d5c3a21b08105b00e2d10671cfa0c7f24330d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-@@ -416,6 +416,7 @@ public class ServerPlayerGameMode {
+@@ -418,6 +418,7 @@ public class ServerPlayerGameMode {
                  }
                  return false;
              }

patches/server/0188-ShulkerBox-allow-oversized-stacks.patch

@@ -9,10 +9,10 @@ creating an itemstack using the TileEntity's NBT data (how it handles it for
 creative players) instead of routing it through the LootableBuilder.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 1351d83efdcab51d3898e1fb77d01b27975ce136..a6bf1fb6fff72b7d6460ce27ee7e7c45d4f4fee4 100644
+index cd1d5c3a21b08105b00e2d10671cfa0c7f24330d..6954d96cf4324f8b608a867463b2b8feb2acd494 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-@@ -445,7 +445,7 @@ public class ServerPlayerGameMode {
+@@ -447,7 +447,7 @@ public class ServerPlayerGameMode {
                      block.destroy(this.level, pos, iblockdata);
                  }
  

patches/server/0196-Flying-Fall-Damage-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Flying Fall Damage API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index f55aef0116caf662f9cf1b14750422de802860bb..df780b1e7d0f598c5b5eb249f69f342af2381a08 100644
+index 5a73b085782dad9e4e35af18e6c70aca70793a5b..e25b8b0023d4f0368f3104a9b2a015585e65b9f9 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -180,6 +180,7 @@ public abstract class Player extends LivingEntity {
@@ -26,10 +26,10 @@ index f55aef0116caf662f9cf1b14750422de802860bb..df780b1e7d0f598c5b5eb249f69f342a
          } else {
              if (fallDistance >= 2.0F) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f223685ecb4e8dfb9b97a97ed106b052953be89f..d43a8f5931a2b6868ed62acb1bfb513612a9faf9 100644
+index 0bd742b09d607ba272a3d18fac164670492f60ca..7e59cad26627286bdba07399177cc8bef74a0c6d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2589,5 +2589,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2614,5 +2614,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void setSpawnInvulnerableTicks(int spawnInvulnerableTime) {
          getHandle().spawnInvulnerableTime = spawnInvulnerableTime;
      }

patches/server/0206-Armor-click-equip-options.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Armor click equip options
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index a6bf1fb6fff72b7d6460ce27ee7e7c45d4f4fee4..add6aa626273fef9cbd4662f83bea6f79312d1da 100644
+index 6954d96cf4324f8b608a867463b2b8feb2acd494..ff159296b0d8acef3af74cd578b00a93fba08f36 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-@@ -495,7 +495,7 @@ public class ServerPlayerGameMode {
+@@ -497,7 +497,7 @@ public class ServerPlayerGameMode {
                  return interactionresultwrapper.getResult();
              } else {
                  player.setItemInHand(hand, itemstack1);

patches/server/0230-Add-force-and-prompt-parameters-to-resource-pack-api.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add force and prompt parameters to resource pack api
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d43a8f5931a2b6868ed62acb1bfb513612a9faf9..416b1b590f10284ad14d3f1bade23fc28e0643d9 100644
+index 7e59cad26627286bdba07399177cc8bef74a0c6d..85ae66b06a7915bb1c91b3962c916fc24e9aefb8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -27,6 +27,8 @@ import java.util.WeakHashMap;
@@ -17,7 +17,7 @@ index d43a8f5931a2b6868ed62acb1bfb513612a9faf9..416b1b590f10284ad14d3f1bade23fc2
  import net.minecraft.Util;
  import net.minecraft.advancements.AdvancementProgress;
  import net.minecraft.core.BlockPos;
-@@ -1708,11 +1710,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1729,11 +1731,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void setResourcePack(String url, byte[] hash) {

patches/server/0232-Extended-OfflinePlayer-API.patch

@@ -223,10 +223,10 @@ index 88bc0807e8bf66a65422f85f1112336334eb3de2..d0e822b329085b9d0a42276c3cacd6cb
 +    // Purpur end - OfflinePlayer API
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 416b1b590f10284ad14d3f1bade23fc28e0643d9..f52f6432438b9295e73ca3c99a6a20ea01a7f1b3 100644
+index 85ae66b06a7915bb1c91b3962c916fc24e9aefb8..8c6791195812a1fc955a249c88d746d66f9bd962 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1883,6 +1883,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1904,6 +1904,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.getHandle().getAbilities().walkingSpeed * 2f;
      }
  

patches/server/0236-Shift-right-click-to-use-exp-for-mending.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Shift right click to use exp for mending
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index add6aa626273fef9cbd4662f83bea6f79312d1da..ccf7491c67b76186b2140f319fca69c9e0cecf92 100644
+index ff159296b0d8acef3af74cd578b00a93fba08f36..ff025406e5755aa3654509bd98363f095cc11840 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-@@ -522,6 +522,7 @@ public class ServerPlayerGameMode {
+@@ -524,6 +524,7 @@ public class ServerPlayerGameMode {
      public InteractionHand interactHand;
      public ItemStack interactItemStack;
      public InteractionResult useItemOn(ServerPlayer player, Level world, ItemStack stack, InteractionHand hand, BlockHitResult hitResult) {
@@ -16,7 +16,7 @@ index add6aa626273fef9cbd4662f83bea6f79312d1da..ccf7491c67b76186b2140f319fca69c9
          BlockPos blockposition = hitResult.getBlockPos();
          BlockState iblockdata = world.getBlockState(blockposition);
          InteractionResult enuminteractionresult = InteractionResult.PASS;
-@@ -615,4 +616,18 @@ public class ServerPlayerGameMode {
+@@ -617,4 +618,18 @@ public class ServerPlayerGameMode {
      public void setLevel(ServerLevel world) {
          this.level = world;
      }