apply paper server file patches

purpur-server/paper-patches/files/src/main/java/com/destroystokyo/paper/Metrics.java.patch

@@ -1,14 +1,6 @@
-From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001
-From: File <noreply+automated@papermc.io>
-Date: Sun, 20 Apr 1997 05:37:42 -0800
-Subject: [PATCH] purpur paperServer File Patches
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
-index 9f4d73fd321f6f0cd19fdd1b63068d2ea6c0816b..6194d6d8952864c71cc4017a639b818e4ecccea9 100644
 --- a/src/main/java/com/destroystokyo/paper/Metrics.java
 +++ b/src/main/java/com/destroystokyo/paper/Metrics.java
-@@ -593,7 +593,7 @@ public class Metrics {
+@@ -593,7 +_,7 @@
              boolean logFailedRequests = config.getBoolean("logFailedRequests", false);
              // Only start Metrics, if it's enabled in the config
              if (config.getBoolean("enabled", true)) {
@@ -17,7 +9,7 @@ index 9f4d73fd321f6f0cd19fdd1b63068d2ea6c0816b..6194d6d8952864c71cc4017a639b818e
  
                  metrics.addCustomChart(new Metrics.SimplePie("minecraft_version", () -> {
                      String minecraftVersion = Bukkit.getVersion();
-@@ -602,16 +602,8 @@ public class Metrics {
+@@ -602,16 +_,8 @@
                  }));
  
                  metrics.addCustomChart(new Metrics.SingleLineChart("players", () -> Bukkit.getOnlinePlayers().size()));

purpur-server/paper-patches/files/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java.patch

@@ -1,14 +1,6 @@
-From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001
-From: File <noreply+automated@papermc.io>
-Date: Sun, 20 Apr 1997 05:37:42 -0800
-Subject: [PATCH] purpur paperServer File Patches
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-index d0554ed6631535815e5932930911e3fe1dee8710..a5a7334f7a1f147945079f20aa04b4f317d9e94c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-@@ -35,7 +35,10 @@ public class PaperVersionFetcher implements VersionFetcher {
+@@ -35,7 +_,10 @@
      private static final Logger LOGGER = LogUtils.getClassLogger();
      private static final int DISTANCE_ERROR = -1;
      private static final int DISTANCE_UNKNOWN = -2;
@@ -20,7 +12,7 @@ index d0554ed6631535815e5932930911e3fe1dee8710..a5a7334f7a1f147945079f20aa04b4f3
  
      @Override
      public long getCacheTime() {
-@@ -49,7 +52,7 @@ public class PaperVersionFetcher implements VersionFetcher {
+@@ -49,7 +_,7 @@
          if (build.buildNumber().isEmpty() && build.gitCommit().isEmpty()) {
              updateMessage = text("You are running a development version without access to version information", color(0xFF5300));
          } else {
@@ -29,7 +21,7 @@ index d0554ed6631535815e5932930911e3fe1dee8710..a5a7334f7a1f147945079f20aa04b4f3
          }
          final @Nullable Component history = this.getHistory();
  
-@@ -57,7 +60,7 @@ public class PaperVersionFetcher implements VersionFetcher {
+@@ -57,7 +_,7 @@
      }
  
      private static Component getUpdateStatusMessage(final String repo, final ServerBuildInfo build) {
@@ -38,7 +30,7 @@ index d0554ed6631535815e5932930911e3fe1dee8710..a5a7334f7a1f147945079f20aa04b4f3
  
          final OptionalInt buildNumber = build.buildNumber();
          if (buildNumber.isPresent()) {
-@@ -71,10 +74,10 @@ public class PaperVersionFetcher implements VersionFetcher {
+@@ -71,10 +_,10 @@
          }
  
          return switch (distance) {
@@ -53,7 +45,7 @@ index d0554ed6631535815e5932930911e3fe1dee8710..a5a7334f7a1f147945079f20aa04b4f3
                  .append(Component.newline())
                  .append(text("Download the new version at: ")
                      .append(text(DOWNLOAD_PAGE, NamedTextColor.GOLD)
-@@ -86,18 +89,15 @@ public class PaperVersionFetcher implements VersionFetcher {
+@@ -86,18 +_,15 @@
      private static int fetchDistanceFromSiteApi(final ServerBuildInfo build, final int jenkinsBuild) {
          try {
              try (final BufferedReader reader = Resources.asCharSource(
@@ -76,7 +68,7 @@ index d0554ed6631535815e5932930911e3fe1dee8710..a5a7334f7a1f147945079f20aa04b4f3
                  return DISTANCE_ERROR;
              }
          } catch (final IOException e) {
-@@ -141,6 +141,6 @@ public class PaperVersionFetcher implements VersionFetcher {
+@@ -141,6 +_,6 @@
              return null;
          }
  

purpur-server/paper-patches/files/src/main/java/com/destroystokyo/paper/console/PaperConsole.java.patch

@@ -1,14 +1,6 @@
-From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001
-From: File <noreply+automated@papermc.io>
-Date: Sun, 20 Apr 1997 05:37:42 -0800
-Subject: [PATCH] purpur paperServer File Patches
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
-index 6ee39b534b8d992655bc0cef3c299d12cbae0034..bc7e4e5560708fea89c584b1d8b471f4966f311a 100644
 --- a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
 +++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
-@@ -20,7 +20,7 @@ public final class PaperConsole extends SimpleTerminalConsole {
+@@ -20,7 +_,7 @@
      @Override
      protected LineReader buildReader(LineReaderBuilder builder) {
          builder

purpur-server/paper-patches/files/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java.patch

@@ -1,14 +1,6 @@
-From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001
-From: File <noreply+automated@papermc.io>
-Date: Sun, 20 Apr 1997 05:37:42 -0800
-Subject: [PATCH] purpur paperServer File Patches
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
-index 771c6b266b913c948c225e59f8e300014fc413b3..ce78c014c2467523833ccd4de19ac5fbabe915ec 100644
 --- a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
 +++ b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
-@@ -143,6 +143,11 @@ public class MobGoalHelper {
+@@ -148,6 +_,11 @@
      private static final Map<String, String> RENAMES = Util.make(new HashMap<>(), map -> {
          map.put("AbstractSkeleton$1", "AbstractSkeletonMelee");
  

purpur-server/paper-patches/files/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java.patch

@@ -1,14 +1,6 @@
-From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001
-From: File <noreply+automated@papermc.io>
-Date: Sun, 20 Apr 1997 05:37:42 -0800
-Subject: [PATCH] purpur paperServer File Patches
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java b/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java
-index 581e988bd7dc9d46c7df2a20073fdb90b5e63a19..1d13661305d0a3a67421ffbf2e3c577151f98955 100644
 --- a/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java
 +++ b/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java
-@@ -60,7 +60,7 @@ public class RAMDetails extends JList<String> {
+@@ -60,7 +_,7 @@
          Vector<String> vector = new Vector<>();
  
          // Follows CraftServer#getTPS
@@ -17,7 +9,7 @@ index 581e988bd7dc9d46c7df2a20073fdb90b5e63a19..1d13661305d0a3a67421ffbf2e3c5771
          String[] tpsAvg = new String[tps.length];
  
          for ( int g = 0; g < tps.length; g++) {
-@@ -69,7 +69,7 @@ public class RAMDetails extends JList<String> {
+@@ -69,7 +_,7 @@
          vector.add("Memory use: " + (data.getUsedMem() / 1024L / 1024L) + " mb (" + (data.getFree() * 100L / data.getMax()) + "% free)");
          vector.add("Heap: " + (data.getTotal() / 1024L / 1024L) + " / " + (data.getMax() / 1024L / 1024L) + " mb");
          vector.add("Avg tick: " + DECIMAL_FORMAT.format((double)this.server.getAverageTickTimeNanos() / (double) TimeUtil.NANOSECONDS_PER_MILLISECOND) + " ms");

purpur-server/paper-patches/files/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java.patch

@@ -1,14 +1,6 @@
-From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001
-From: File <noreply+automated@papermc.io>
-Date: Sun, 20 Apr 1997 05:37:42 -0800
-Subject: [PATCH] purpur paperServer File Patches
-
-
-diff --git a/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java b/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
-index 74ffdc823e66fc5ec027c4b7c462382bcbfe2be2..1b0ee48e28aaa68ddb1f28c23d3c5f5f40505c98 100644
 --- a/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
 +++ b/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
-@@ -31,6 +31,7 @@ public record ServerBuildInfoImpl(
+@@ -31,6 +_,7 @@
      private static final String ATTRIBUTE_GIT_COMMIT = "Git-Commit";
  
      private static final String BRAND_PAPER_NAME = "Paper";
@@ -16,7 +8,7 @@ index 74ffdc823e66fc5ec027c4b7c462382bcbfe2be2..1b0ee48e28aaa68ddb1f28c23d3c5f5f
  
      private static final String BUILD_DEV = "DEV";
  
-@@ -42,9 +43,9 @@ public record ServerBuildInfoImpl(
+@@ -42,9 +_,9 @@
          this(
              getManifestAttribute(manifest, ATTRIBUTE_BRAND_ID)
                  .map(Key::key)
@@ -28,7 +20,7 @@ index 74ffdc823e66fc5ec027c4b7c462382bcbfe2be2..1b0ee48e28aaa68ddb1f28c23d3c5f5f
              SharedConstants.getCurrentVersion().id(),
              SharedConstants.getCurrentVersion().name(),
              getManifestAttribute(manifest, ATTRIBUTE_BUILD_NUMBER)
-@@ -61,7 +62,7 @@ public record ServerBuildInfoImpl(
+@@ -61,7 +_,7 @@
  
      @Override
      public boolean isBrandCompatible(final @NotNull Key brandId) {

purpur-server/paper-patches/files/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java.patch

@@ -1,14 +1,6 @@
-From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001
-From: File <noreply+automated@papermc.io>
-Date: Sun, 20 Apr 1997 05:37:42 -0800
-Subject: [PATCH] purpur paperServer File Patches
-
-
-diff --git a/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java b/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java
-index 9c49bb7fb8c3ca4b62e73dcfca2669971defb181..727253cb847e56e8716bc6b17512c0eb515f34e3 100644
 --- a/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java
 +++ b/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java
-@@ -74,10 +74,10 @@ public class PaperPluginsCommand {
+@@ -74,10 +_,10 @@
              .build();
      }
  
@@ -21,7 +13,7 @@ index 9c49bb7fb8c3ca4b62e73dcfca2669971defb181..727253cb847e56e8716bc6b17512c0eb
          }
  
          boolean isFirst = true;
-@@ -104,15 +104,49 @@ public class PaperPluginsCommand {
+@@ -104,15 +_,49 @@
          return formattedSubLists;
      }
  
@@ -74,7 +66,7 @@ index 9c49bb7fb8c3ca4b62e73dcfca2669971defb181..727253cb847e56e8716bc6b17512c0eb
  
          builder.append(pluginName);
  
-@@ -130,6 +164,23 @@ public class PaperPluginsCommand {
+@@ -130,6 +_,23 @@
          return componentHeader.append(Component.text(":")).build();
      }
  
@@ -98,7 +90,7 @@ index 9c49bb7fb8c3ca4b62e73dcfca2669971defb181..727253cb847e56e8716bc6b17512c0eb
      private static Component asPlainComponents(final String strings) {
          final net.kyori.adventure.text.TextComponent.Builder builder = Component.text();
          for (final String string : strings.split("\n")) {
-@@ -188,25 +239,25 @@ public class PaperPluginsCommand {
+@@ -188,25 +_,25 @@
          final int sizePaperPlugins = paperPlugins.size();
          final int sizeSpigotPlugins = spigotPlugins.size();
          final int sizePlugins = sizePaperPlugins + sizeSpigotPlugins;

purpur-server/paper-patches/files/src/main/java/io/papermc/paper/logging/SysoutCatcher.java.patch

@@ -1,14 +1,6 @@
-From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001
-From: File <noreply+automated@papermc.io>
-Date: Sun, 20 Apr 1997 05:37:42 -0800
-Subject: [PATCH] purpur paperServer File Patches
-
-
-diff --git a/src/main/java/io/papermc/paper/logging/SysoutCatcher.java b/src/main/java/io/papermc/paper/logging/SysoutCatcher.java
-index a8e813ca89b033f061e695288b3383bdcf128531..96a377a07d8396f893954a3ba97fbf88d73faf6d 100644
 --- a/src/main/java/io/papermc/paper/logging/SysoutCatcher.java
 +++ b/src/main/java/io/papermc/paper/logging/SysoutCatcher.java
-@@ -54,9 +54,9 @@ public final class SysoutCatcher {
+@@ -54,9 +_,9 @@
                  final JavaPlugin plugin = JavaPlugin.getProvidingPlugin(clazz);
  
                  // Instead of just printing the message, send it to the plugin's logger

purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java.patch

@@ -1,14 +1,6 @@
-From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001
-From: File <noreply+automated@papermc.io>
-Date: Sun, 20 Apr 1997 05:37:42 -0800
-Subject: [PATCH] purpur paperServer File Patches
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-index 872552864cd3ba5fff53d7fad6c7f16966d57a16..81684971a194a3b1f56b8d812b2e96bcfcd3860b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-@@ -342,6 +342,12 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
+@@ -342,6 +_,12 @@
  
      @Override
      public Location getLocation() {
@@ -21,7 +13,7 @@ index 872552864cd3ba5fff53d7fad6c7f16966d57a16..81684971a194a3b1f56b8d812b2e96bc
          CompoundTag data = this.getData();
          if (data == null) {
              return null;
-@@ -579,4 +585,183 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
+@@ -579,4 +_,183 @@
              manager.save();
          }
      }

purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch

@@ -1,14 +1,6 @@
-From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001
-From: File <noreply+automated@papermc.io>
-Date: Sun, 20 Apr 1997 05:37:42 -0800
-Subject: [PATCH] purpur paperServer File Patches
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 34d74014fd042f6eeafafadb6237a838b1ddd47c..7f6f35493b5a21742b827b2840c0cb611bbf0586 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -417,6 +417,20 @@ public final class CraftServer implements Server {
+@@ -417,6 +_,20 @@
          this.paperPluginManager = new io.papermc.paper.plugin.manager.PaperPluginManagerImpl(this, this.commandMap, pluginManager);
          this.pluginManager.paperPluginManager = this.paperPluginManager;
           // Paper end
@@ -29,15 +21,15 @@ index 34d74014fd042f6eeafafadb6237a838b1ddd47c..7f6f35493b5a21742b827b2840c0cb61
  
          CraftRegistry.setMinecraftRegistry(console.registryAccess());
  
-@@ -992,6 +1006,7 @@ public final class CraftServer implements Server {
+@@ -992,6 +_,7 @@
  
          org.spigotmc.SpigotConfig.init((File) this.console.options.valueOf("spigot-settings")); // Spigot
          this.console.paperConfigurations.reloadConfigs(this.console);
 +        org.purpurmc.purpur.PurpurConfig.init((File) console.options.valueOf("purpur-settings")); // Purpur - Purpur config files
          for (ServerLevel world : this.console.getAllLevels()) {
              // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
-             world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && world.getGameRules().getBoolean(GameRules.RULE_SPAWN_MONSTERS)); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
+             world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && world.getGameRules().get(GameRules.SPAWN_MONSTERS)); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
-@@ -1007,6 +1022,7 @@ public final class CraftServer implements Server {
+@@ -1007,6 +_,7 @@
                  }
              }
              world.spigotConfig.init(); // Spigot
@@ -45,7 +37,7 @@ index 34d74014fd042f6eeafafadb6237a838b1ddd47c..7f6f35493b5a21742b827b2840c0cb61
          }
  
          Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
-@@ -1024,6 +1040,7 @@ public final class CraftServer implements Server {
+@@ -1024,6 +_,7 @@
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
          io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
          this.spark.registerCommandBeforePlugins(this); // Paper - spark
@@ -53,7 +45,7 @@ index 34d74014fd042f6eeafafadb6237a838b1ddd47c..7f6f35493b5a21742b827b2840c0cb61
          this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -1482,6 +1499,60 @@ public final class CraftServer implements Server {
+@@ -1484,6 +_,60 @@
          return true;
      }
  
@@ -114,7 +106,7 @@ index 34d74014fd042f6eeafafadb6237a838b1ddd47c..7f6f35493b5a21742b827b2840c0cb61
      @Override
      public List<Recipe> getRecipesFor(ItemStack result) {
          Preconditions.checkArgument(result != null, "ItemStack cannot be null");
-@@ -2727,6 +2798,18 @@ public final class CraftServer implements Server {
+@@ -2729,6 +_,18 @@
              return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
          }
  
@@ -133,7 +125,7 @@ index 34d74014fd042f6eeafafadb6237a838b1ddd47c..7f6f35493b5a21742b827b2840c0cb61
          @Override
          public void restart() {
              CraftServer.this.restart();
-@@ -2962,4 +3045,18 @@ public final class CraftServer implements Server {
+@@ -2964,4 +_,18 @@
      public void allowPausing(final Plugin plugin, final boolean value) {
          this.console.addPluginAllowingSleep(plugin.getName(), value);
      }

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

@@ -1,14 +1,6 @@
-From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001
-From: File <noreply+automated@papermc.io>
-Date: Sun, 20 Apr 1997 05:37:42 -0800
-Subject: [PATCH] purpur paperServer File Patches
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index e92827b83d2cd7f18ed214ce389ac423b6d2d922..4e0d9d603659718e6a56dfa46cf69fb37741ec7b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1955,6 +1955,52 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1937,6 +_,52 @@
          return (this.getHandle().getDragonFight() == null) ? null : new CraftDragonBattle(this.getHandle().getDragonFight());
      }
  

purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/Main.java.patch

@@ -1,14 +1,6 @@
-From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001
-From: File <noreply+automated@papermc.io>
-Date: Sun, 20 Apr 1997 05:37:42 -0800
-Subject: [PATCH] purpur paperServer File Patches
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 5bd6da467a1f536eb56c93ea00f98050cfaa36d0..7e99752be20868606ab31b9db831c9940f970c9b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -164,6 +164,14 @@ public class Main {
+@@ -164,6 +_,14 @@
                          .defaultsTo(new File[] {})
                          .describedAs("Jar file");
  
@@ -23,7 +15,7 @@ index 5bd6da467a1f536eb56c93ea00f98050cfaa36d0..7e99752be20868606ab31b9db831c994
                  this.accepts("server-name", "Name of the server")
                          .withRequiredArg()
                          .ofType(String.class)
-@@ -223,7 +231,7 @@ public class Main {
+@@ -223,7 +_,7 @@
                      System.setProperty(net.minecrell.terminalconsole.TerminalConsoleAppender.JLINE_OVERRIDE_PROPERTY, "false"); // Paper
                  }
  

purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java.patch

@@ -1,14 +1,6 @@
-From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001
-From: File <noreply+automated@papermc.io>
-Date: Sun, 20 Apr 1997 05:37:42 -0800
-Subject: [PATCH] purpur paperServer File Patches
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java
-index ed4692090a115d3d0a0826b10f77e903058eeec6..205c367fd5e2921d36f78ac7df5999d4adb819d0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java
-@@ -16,8 +16,15 @@ import org.bukkit.entity.Bee;
+@@ -16,8 +_,15 @@
  
  public class CraftBeehive extends CraftBlockEntityState<BeehiveBlockEntity> implements Beehive {
  
@@ -24,7 +16,7 @@ index ed4692090a115d3d0a0826b10f77e903058eeec6..205c367fd5e2921d36f78ac7df5999d4
      }
  
      protected CraftBeehive(CraftBeehive state, Location location) {
-@@ -76,14 +83,54 @@ public class CraftBeehive extends CraftBlockEntityState<BeehiveBlockEntity> impl
+@@ -76,14 +_,54 @@
              }
          }
  
@@ -79,7 +71,7 @@ index ed4692090a115d3d0a0826b10f77e903058eeec6..205c367fd5e2921d36f78ac7df5999d4
      }
  
      @Override
-@@ -100,6 +147,7 @@ public class CraftBeehive extends CraftBlockEntityState<BeehiveBlockEntity> impl
+@@ -100,6 +_,7 @@
      @Override
      public void clearEntities() {
          getSnapshot().clearBees();

purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/block/CraftConduit.java.patch

@@ -1,14 +1,6 @@
-From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001
-From: File <noreply+automated@papermc.io>
-Date: Sun, 20 Apr 1997 05:37:42 -0800
-Subject: [PATCH] purpur paperServer File Patches
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftConduit.java b/src/main/java/org/bukkit/craftbukkit/block/CraftConduit.java
-index 1c448bc38fa554707e0bfb99ded70b093e49926c..77e6913358ac992b503712cccb871518770fee0b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftConduit.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftConduit.java
-@@ -75,7 +75,7 @@ public class CraftConduit extends CraftBlockEntityState<ConduitBlockEntity> impl
+@@ -75,7 +_,7 @@
      public int getRange() {
          this.ensureNoWorldGeneration();
          ConduitBlockEntity conduit = (ConduitBlockEntity) this.getBlockEntityFromWorld();

purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/command/CraftConsoleCommandSender.java.patch

@@ -1,14 +1,6 @@
-From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001
-From: File <noreply+automated@papermc.io>
-Date: Sun, 20 Apr 1997 05:37:42 -0800
-Subject: [PATCH] purpur paperServer File Patches
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/command/CraftConsoleCommandSender.java b/src/main/java/org/bukkit/craftbukkit/command/CraftConsoleCommandSender.java
-index 6e2f931b06d4ef702e0abf609a5f5bba780c5b7a..15ae2653c1809041b7ab7cb67015e82c226e9f77 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/CraftConsoleCommandSender.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/CraftConsoleCommandSender.java
-@@ -21,7 +21,12 @@ public class CraftConsoleCommandSender extends ServerCommandSender implements Co
+@@ -21,7 +_,12 @@
  
      @Override
      public void sendMessage(String message) {
@@ -22,7 +14,7 @@ index 6e2f931b06d4ef702e0abf609a5f5bba780c5b7a..15ae2653c1809041b7ab7cb67015e82c
      }
  
      @Override
-@@ -88,7 +93,7 @@ public class CraftConsoleCommandSender extends ServerCommandSender implements Co
+@@ -88,7 +_,7 @@
  
      @Override
      public void sendMessage(final net.kyori.adventure.identity.Identity identity, final net.kyori.adventure.text.Component message, final net.kyori.adventure.audience.MessageType type) {

purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftCopperGolem.java.patch

@@ -1,14 +1,6 @@
-From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001
-From: File <noreply+automated@papermc.io>
-Date: Sun, 20 Apr 1997 05:37:42 -0800
-Subject: [PATCH] purpur paperServer File Patches
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftCopperGolem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftCopperGolem.java
-index 0ea9e83df77ff6caaf62ac35a9174278c72c02a9..e7c092d6cea018ea408ead6c20863f46dab7e3e0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCopperGolem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftCopperGolem.java
-@@ -55,4 +55,17 @@ public class CraftCopperGolem extends CraftGolem implements CopperGolem, PaperSh
+@@ -55,4 +_,17 @@
              default -> throw new IllegalStateException("Unexpected value: " + oxidizing);
          }
      }

purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java.patch

@@ -1,14 +1,6 @@
-From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001
-From: File <noreply+automated@papermc.io>
-Date: Sun, 20 Apr 1997 05:37:42 -0800
-Subject: [PATCH] purpur paperServer File Patches
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java
-index 000c5ea5d39d5ab6e5592012ab1cc7ee547505dc..140da7078217f833f490d88faaf803ab1763115d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java
-@@ -16,12 +16,12 @@ public class CraftEndermite extends CraftMonster implements Endermite {
+@@ -16,12 +_,12 @@
  
      @Override
      public boolean isPlayerSpawned() {

purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java.patch

@@ -1,14 +1,6 @@
-From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001
-From: File <noreply+automated@papermc.io>
-Date: Sun, 20 Apr 1997 05:37:42 -0800
-Subject: [PATCH] purpur paperServer File Patches
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index b177e23db960323b901909a3f845a9ae0426d0df..bf3674f8984dd0ee441e04f92b747f908d629953 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -113,6 +113,18 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -114,6 +_,18 @@
          this.entityType = CraftEntityType.minecraftToBukkit(entity.getType());
      }
  

purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java.patch

@@ -0,0 +1,10 @@
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
+@@ -291,6 +_,7 @@
+     @Override
+     public void recalculatePermissions() {
+         this.perm.recalculatePermissions();
++        getHandle().canPortalInstant = hasPermission("purpur.portal.instant"); // Purpur - Add portal permission bypass
+     }
+ 
+     @Override

purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftIronGolem.java.patch

@@ -1,14 +1,6 @@
-From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001
-From: File <noreply+automated@papermc.io>
-Date: Sun, 20 Apr 1997 05:37:42 -0800
-Subject: [PATCH] purpur paperServer File Patches
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftIronGolem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftIronGolem.java
-index 2d7be6f2afe32fd7555640989313052d37973e61..5bafbb876e4780ff6ea0408c95007bdfcef8fa89 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftIronGolem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftIronGolem.java
-@@ -22,4 +22,17 @@ public class CraftIronGolem extends CraftGolem implements IronGolem {
+@@ -22,4 +_,17 @@
      public void setPlayerCreated(boolean playerCreated) {
          this.getHandle().setPlayerCreated(playerCreated);
      }

purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java.patch

@@ -1,14 +1,6 @@
-From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001
-From: File <noreply+automated@papermc.io>
-Date: Sun, 20 Apr 1997 05:37:42 -0800
-Subject: [PATCH] purpur paperServer File Patches
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-index d849e22060d0ec6d4b4ca8079ac5cec26e1a1855..4efb73372b91b8c83a6c5a2b2cb099d229db0621 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-@@ -145,4 +145,53 @@ public class CraftItem extends CraftEntity implements Item {
+@@ -145,4 +_,53 @@
      public UUID getThrower() {
          return Optionull.map(this.getHandle().thrower, EntityReference::getUUID);
      }

purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java.patch

@@ -1,14 +1,6 @@
-From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001
-From: File <noreply+automated@papermc.io>
-Date: Sun, 20 Apr 1997 05:37:42 -0800
-Subject: [PATCH] purpur paperServer File Patches
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index a0fabdcb744fda303e8ba8f2b267f4f92d29f4c6..3feb3ee939ce3814aec289841bae7f928893b83e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -482,7 +482,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -482,7 +_,7 @@
          net.minecraft.server.level.ServerPlayer nmsKiller = killer == null ? null : ((CraftPlayer) killer).getHandle();
          this.getHandle().setLastHurtByMob(nmsKiller);
          if (nmsKiller != null) {

purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java.patch

@@ -1,14 +1,6 @@
-From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001
-From: File <noreply+automated@papermc.io>
-Date: Sun, 20 Apr 1997 05:37:42 -0800
-Subject: [PATCH] purpur paperServer File Patches
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
-index 96b88f301b558fbb22fdcd21fef36bf15623ee93..4633de441cfb011278c009096689414a951a19f4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
-@@ -86,4 +86,17 @@ public class CraftLlama extends CraftChestedHorse implements Llama, com.destroys
+@@ -86,4 +_,17 @@
      public Llama getCaravanTail() {
          return this.getHandle().caravanTail == null ? null : (Llama) this.getHandle().caravanTail.getBukkitEntity();
      }

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

@@ -1,14 +1,6 @@
-From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001
-From: File <noreply+automated@papermc.io>
-Date: Sun, 20 Apr 1997 05:37:42 -0800
-Subject: [PATCH] purpur paperServer File Patches
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7c9f48d22b933b92f21ceea8752b3dfe6ba071b2..788bd6342c865dbd2778dcfd82c7059869dd6c98 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -579,10 +579,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa
+@@ -581,10 +_,15 @@
  
      @Override
      public void setPlayerListName(String name) {
@@ -25,7 +17,7 @@ index 7c9f48d22b933b92f21ceea8752b3dfe6ba071b2..788bd6342c865dbd2778dcfd82c70598
          if (this.getHandle().connection == null) return; // Paper - Updates are possible before the player has fully joined
          for (ServerPlayer player : this.server.getHandle().players) {
              if (player.getBukkitEntity().canSee(this)) {
-@@ -985,6 +990,80 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa
+@@ -987,6 +_,80 @@
          }
      }
  
@@ -106,10 +98,11 @@ index 7c9f48d22b933b92f21ceea8752b3dfe6ba071b2..788bd6342c865dbd2778dcfd82c70598
      @Override
      public void sendBlockDamage(Location loc, float progress, org.bukkit.entity.Entity source) {
          Preconditions.checkArgument(source != null, "source must not be null");
-@@ -2493,6 +2572,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa
+@@ -2494,6 +_,28 @@
+     public float getWalkSpeed() {
          return this.getHandle().getAbilities().walkingSpeed * 2f;
      }
- 
++
 +    // Purpur start - OfflinePlayer API
 +    @Override
 +    public boolean teleportOffline(Location destination) {
@@ -131,7 +124,6 @@ index 7c9f48d22b933b92f21ceea8752b3dfe6ba071b2..788bd6342c865dbd2778dcfd82c70598
 +        return this.teleportAsync(destination, cause);
 +    }
 +    // Purpur end - OfflinePlayer API
-+
+ 
      private void validateSpeed(float value) {
          Preconditions.checkArgument(value <= 1f && value >= -1f, "Speed value (%s) need to be between -1f and 1f", value);
-     }

purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java.patch

@@ -1,14 +1,6 @@
-From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001
-From: File <noreply+automated@papermc.io>
-Date: Sun, 20 Apr 1997 05:37:42 -0800
-Subject: [PATCH] purpur paperServer File Patches
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java
-index f03f9f94c51ef2f2eb24e4f65ec69b542b1c0a07..af60e3ef00ce1e98708d9963d466e72b6cde53cc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java
-@@ -24,4 +24,17 @@ public class CraftSnowman extends CraftGolem implements Snowman, com.destroystok
+@@ -24,4 +_,17 @@
      public void setDerp(boolean derpMode) {
          this.getHandle().setPumpkin(!derpMode);
      }

purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java.patch

@@ -0,0 +1,14 @@
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
+@@ -243,4 +_,11 @@
+     public void restock() {
+         getHandle().restock();
+     }
++
++    // Purpur start - Lobotomize stuck villagers
++    @Override
++    public boolean isLobotomized() {
++        return getHandle().isLobotomized();
++    }
++    // Purpur end - Lobotomize stuck villagers
+ }

purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java.patch

@@ -1,14 +1,6 @@
-From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001
-From: File <noreply+automated@papermc.io>
-Date: Sun, 20 Apr 1997 05:37:42 -0800
-Subject: [PATCH] purpur paperServer File Patches
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
-index 2e11df97e5c8ff5fbf22ba87946d6018ac8bbbed..83b779eb0adcaf2e6d5658cddc2607f6deea6bb9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
-@@ -92,4 +92,18 @@ public class CraftWither extends CraftMonster implements Wither, com.destroystok
+@@ -92,4 +_,18 @@
      public void enterInvulnerabilityPhase() {
          this.getHandle().makeInvulnerable();
      }

purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java.patch

@@ -1,14 +1,6 @@
-From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001
-From: File <noreply+automated@papermc.io>
-Date: Sun, 20 Apr 1997 05:37:42 -0800
-Subject: [PATCH] purpur paperServer File Patches
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java
-index 723a8e659485850632adf173e52669e6e4f3fcc0..6317c2208fd842d4453f96a9c5dbc13ece0961f8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java
-@@ -90,6 +90,18 @@ public class CraftWolf extends CraftTameableAnimal implements Wolf {
+@@ -90,6 +_,18 @@
          this.getHandle().setSoundVariant(CraftSoundVariant.bukkitToMinecraftHolder(soundVariant));
      }
  
@@ -26,4 +18,4 @@ index 723a8e659485850632adf173e52669e6e4f3fcc0..6317c2208fd842d4453f96a9c5dbc13e
 +
      public static class CraftVariant extends HolderableBase<WolfVariant> implements Variant {
  
-         public static Variant minecraftToBukkit(WolfVariant minecraft) {
+         public static Variant minecraftHolderToBukkit(Holder<WolfVariant> minecraft) {

purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java.patch

@@ -1,14 +1,6 @@
-From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001
-From: File <noreply+automated@papermc.io>
-Date: Sun, 20 Apr 1997 05:37:42 -0800
-Subject: [PATCH] purpur paperServer File Patches
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java
-index 792cb6adf0c7a6335cc5985fce8bed2e0f1149af..5734c5caffda79383ae30df20c3defb51b87f39e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java
-@@ -19,6 +19,10 @@ public class CraftInventoryAnvil extends CraftResultInventory implements AnvilIn
+@@ -19,6 +_,10 @@
      private int repairCost;
      private int repairCostAmount;
      private int maximumRepairCost;
@@ -19,7 +11,7 @@ index 792cb6adf0c7a6335cc5985fce8bed2e0f1149af..5734c5caffda79383ae30df20c3defb5
  
      public CraftInventoryAnvil(Location location, Container inventory, Container resultInventory) {
          super(inventory, resultInventory);
-@@ -27,6 +31,10 @@ public class CraftInventoryAnvil extends CraftResultInventory implements AnvilIn
+@@ -27,6 +_,10 @@
          this.repairCost = CraftInventoryAnvil.DEFAULT_REPAIR_COST;
          this.repairCostAmount = CraftInventoryAnvil.DEFAULT_REPAIR_COST_AMOUNT;
          this.maximumRepairCost = CraftInventoryAnvil.DEFAULT_MAXIMUM_REPAIR_COST;
@@ -30,7 +22,7 @@ index 792cb6adf0c7a6335cc5985fce8bed2e0f1149af..5734c5caffda79383ae30df20c3defb5
      }
  
      @Override
-@@ -113,4 +121,30 @@ public class CraftInventoryAnvil extends CraftResultInventory implements AnvilIn
+@@ -113,4 +_,30 @@
              consumer.accept(cav);
          }
      }

purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java.patch

@@ -1,14 +1,6 @@
-From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001
-From: File <noreply+automated@papermc.io>
-Date: Sun, 20 Apr 1997 05:37:42 -0800
-Subject: [PATCH] purpur paperServer File Patches
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 96c0797aaea76400877f5f87ede32c65a4fc8ef9..ac245e7213545994c56b8a20e8ce32d3d46e2955 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-@@ -672,4 +672,285 @@ public final class CraftItemStack extends ItemStack {
+@@ -672,4 +_,285 @@
      }
  
      // Paper end - data component API

purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java.patch

@@ -1,14 +1,6 @@
-From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001
-From: File <noreply+automated@papermc.io>
-Date: Sun, 20 Apr 1997 05:37:42 -0800
-Subject: [PATCH] purpur paperServer File Patches
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java
-index 4864e2016cb1d377425297fd1c52b383632cb59e..953d64d128a53eb9ec2ff55140dde5cb80326044 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java
-@@ -36,6 +36,7 @@ public interface CraftRecipe extends Recipe {
+@@ -36,6 +_,7 @@
              stack = Ingredient.of(((RecipeChoice.MaterialChoice) bukkit).getChoices().stream().map((mat) -> CraftItemType.bukkitToMinecraft(mat)));
          } else if (bukkit instanceof RecipeChoice.ExactChoice) {
              stack = Ingredient.ofStacks(((RecipeChoice.ExactChoice) bukkit).getChoices().stream().map((mat) -> CraftItemStack.asNMSCopy(mat)).toList());

purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftAnvilView.java.patch

@@ -1,14 +1,6 @@
-From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001
-From: File <noreply+automated@papermc.io>
-Date: Sun, 20 Apr 1997 05:37:42 -0800
-Subject: [PATCH] purpur paperServer File Patches
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftAnvilView.java b/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftAnvilView.java
-index 2b3844f5ecc1bfbf3f5dab1c00d06f8be27f39e9..4e535c287137ceedd4d48047b03f4578c33467b0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftAnvilView.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftAnvilView.java
-@@ -73,4 +73,26 @@ public class CraftAnvilView extends CraftInventoryView<AnvilMenu, AnvilInventory
+@@ -73,4 +_,26 @@
              this.setMaximumRepairCost(legacy.getMaximumRepairCost());
          }
      }

purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java.patch

@@ -1,14 +1,6 @@
-From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001
-From: File <noreply+automated@papermc.io>
-Date: Sun, 20 Apr 1997 05:37:42 -0800
-Subject: [PATCH] purpur paperServer File Patches
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java b/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java
-index 0b9b29753984bebaf01e2edc6d325cd5df6c689d..b6d13bd035bc6f0f7ae6d66d7186cdb256b9194c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java
 +++ b/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java
-@@ -260,6 +260,7 @@ public final class CraftLegacy {
+@@ -260,6 +_,7 @@
      }
  
      static {

purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java.patch

@@ -1,14 +1,6 @@
-From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001
-From: File <noreply+automated@papermc.io>
-Date: Sun, 20 Apr 1997 05:37:42 -0800
-Subject: [PATCH] purpur paperServer File Patches
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java b/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java
-index 9bc8055c36322c79077af57ab72d5493f5e65b7d..9f50bfc899d747f4e9287a646c6c6103bf501660 100644
 --- a/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java
 +++ b/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java
-@@ -703,4 +703,32 @@ public class MaterialRerouting {
+@@ -703,4 +_,32 @@
          meta.setCanPlaceOn(materials);
      }
      // Paper end

purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java.patch

@@ -0,0 +1,13 @@
+--- a/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java
++++ b/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java
+@@ -46,4 +_,10 @@
+         }
+     }
+ 
++    // Purpur start - Explorer Map API
++    @Override
++    public boolean isExplorerMap() {
++        return this.worldMap.isExplorerMap;
++    }
++    // Purpur end - Explorer Map API
+ }

purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java.patch

@@ -1,14 +1,6 @@
-From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001
-From: File <noreply+automated@papermc.io>
-Date: Sun, 20 Apr 1997 05:37:42 -0800
-Subject: [PATCH] purpur paperServer File Patches
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 7ffb7a210bf840009158d5e4364dad78221ded6c..554fc2c53b5028c8f89a0ae69a75e075ba4f4435 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-@@ -491,7 +491,7 @@ public class CraftScheduler implements BukkitScheduler {
+@@ -491,7 +_,7 @@
                  this.parsePending();
              } else {
                  // this.debugTail = this.debugTail.setNext(new CraftAsyncDebugger(this.currentTick + CraftScheduler.RECENT_TICKS, task.getOwner(), task.getTaskClass())); // Paper

purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java.patch

@@ -1,14 +1,6 @@
-From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001
-From: File <noreply+automated@papermc.io>
-Date: Sun, 20 Apr 1997 05:37:42 -0800
-Subject: [PATCH] purpur paperServer File Patches
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java b/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java
-index 8893a94d542952811ef9915ff6074b30892653d9..ae5d4348b8305f40fa87e17a202edbcb7b26e727 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java
-@@ -23,7 +23,15 @@ public final class CommandPermissions {
+@@ -23,7 +_,15 @@
          DefaultPermissions.registerPermission(CommandPermissions.PREFIX + "kick", "Allows the user to kick players", PermissionDefault.OP, commands);
          DefaultPermissions.registerPermission(CommandPermissions.PREFIX + "stop", "Allows the user to stop the server", PermissionDefault.OP, commands);
          DefaultPermissions.registerPermission(CommandPermissions.PREFIX + "list", "Allows the user to list all online players", PermissionDefault.OP, commands);

purpur-server/paper-patches/files/src/main/java/org/spigotmc/TicksPerSecondCommand.java.patch

@@ -1,14 +1,6 @@
-From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001
-From: File <noreply+automated@papermc.io>
-Date: Sun, 20 Apr 1997 05:37:42 -0800
-Subject: [PATCH] purpur paperServer File Patches
-
-
-diff --git a/src/main/java/org/spigotmc/TicksPerSecondCommand.java b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
-index 2756ca738b99792495f4fe6128b75e03f73936f1..2e252d9b1f8323670c91abe4832f1c63303fbf88 100644
 --- a/src/main/java/org/spigotmc/TicksPerSecondCommand.java
 +++ b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
-@@ -47,7 +47,7 @@ public class TicksPerSecondCommand extends Command {
+@@ -47,7 +_,7 @@
          }
  
          TextComponent.Builder builder = text();

purpur-server/paper-patches/files/src/main/java/org/spigotmc/WatchdogThread.java.patch

@@ -1,14 +1,6 @@
-From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001
-From: File <noreply+automated@papermc.io>
-Date: Sun, 20 Apr 1997 05:37:42 -0800
-Subject: [PATCH] purpur paperServer File Patches
-
-
-diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index e2dc6644ae44ce02821100275ede4b0712cf260d..bf0cda94d87e46149a21505fc67ddb9ad9af0838 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
-@@ -25,7 +25,7 @@ public class WatchdogThread extends ca.spottedleaf.moonrise.common.util.TickThre
+@@ -25,7 +_,7 @@
      private volatile boolean stopping;
  
      private WatchdogThread(long timeoutTime, boolean restart) {
@@ -17,7 +9,7 @@ index e2dc6644ae44ce02821100275ede4b0712cf260d..bf0cda94d87e46149a21505fc67ddb9a
          this.timeoutTime = timeoutTime;
          this.restart = restart;
          this.earlyWarningEvery = Math.min(GlobalConfiguration.get().watchdog.earlyWarningEvery, timeoutTime);
-@@ -75,14 +75,14 @@ public class WatchdogThread extends ca.spottedleaf.moonrise.common.util.TickThre
+@@ -75,14 +_,14 @@
                  this.lastEarlyWarning = currentTime;
                  if (isLongTimeout) {
                      logger.log(Level.SEVERE, "------------------------------");
@@ -35,7 +27,7 @@ index e2dc6644ae44ce02821100275ede4b0712cf260d..bf0cda94d87e46149a21505fc67ddb9a
  
                      if (net.minecraft.world.level.Level.lastPhysicsProblem != null) {
                          logger.log(Level.SEVERE, "------------------------------");
-@@ -102,12 +102,12 @@ public class WatchdogThread extends ca.spottedleaf.moonrise.common.util.TickThre
+@@ -102,12 +_,12 @@
                      }
                      // Paper end
                  } else {
@@ -50,7 +42,7 @@ index e2dc6644ae44ce02821100275ede4b0712cf260d..bf0cda94d87e46149a21505fc67ddb9a
                  FeatureHooks.dumpAllChunkLoadInfo(MinecraftServer.getServer(), isLongTimeout); // Paper - log detailed tick information
                  WatchdogThread.dumpThread(ManagementFactory.getThreadMXBean().getThreadInfo(MinecraftServer.getServer().serverThread.threadId(), Integer.MAX_VALUE), logger);
                  logger.log(Level.SEVERE, "------------------------------");
-@@ -120,7 +120,7 @@ public class WatchdogThread extends ca.spottedleaf.moonrise.common.util.TickThre
+@@ -120,7 +_,7 @@
                          WatchdogThread.dumpThread(thread, logger);
                      }
                  } else {

purpur-server/paper-patches/files/src/main/resources/log4j2.xml.patch

@@ -1,14 +1,6 @@
-From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001
-From: File <noreply+automated@papermc.io>
-Date: Sun, 20 Apr 1997 05:37:42 -0800
-Subject: [PATCH] purpur paperServer File Patches
-
-
-diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index d2a75850af9c6ad2aca66a5f994f1b587d73eac4..a056aa167887abef9e6d531a9edd2cda433567d2 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
-@@ -2,7 +2,16 @@
+@@ -2,7 +_,16 @@
  <Configuration status="WARN" shutdownHook="disable">
      <Appenders>
          <Queue name="ServerGuiConsole">

purpur-server/paper-patches/files/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java.patch

@@ -1,14 +1,6 @@
-From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001
-From: File <noreply+automated@papermc.io>
-Date: Sun, 20 Apr 1997 05:37:42 -0800
-Subject: [PATCH] purpur paperServer File Patches
-
-
-diff --git a/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java b/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java
-index fe08e446e86d53cef6eecc33cd484e93adc42871..54fff448fded12cd6110583f0c255f2ca86388da 100644
 --- a/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java
 +++ b/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java
-@@ -46,6 +46,7 @@ public class MinecraftCommandPermissionsTest {
+@@ -46,6 +_,7 @@
          Set<String> foundPerms = new HashSet<>();
          for (CommandNode<CommandSourceStack> child : root.getChildren()) {
              final String vanillaPerm = VanillaCommandWrapper.getPermission(child);
@@ -16,7 +8,7 @@ index fe08e446e86d53cef6eecc33cd484e93adc42871..54fff448fded12cd6110583f0c255f2c
              if (!perms.contains(vanillaPerm)) {
                  missing.add("Missing permission for " + child.getName() + " (" + vanillaPerm + ") command");
              } else {
-@@ -58,6 +59,25 @@ public class MinecraftCommandPermissionsTest {
+@@ -58,6 +_,25 @@
      }
  
      private static final List<String> TO_SKIP = List.of(

purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java.patch

@@ -1,18 +0,0 @@
-From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001
-From: File <noreply+automated@papermc.io>
-Date: Sun, 20 Apr 1997 05:37:42 -0800
-Subject: [PATCH] purpur paperServer File Patches
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 939cdd623253557712ca5284af421b3a7c33f612..aa32df881a5bfccd58d2a3b25cb4ee7373234879 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-@@ -289,6 +289,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
-     @Override
-     public void recalculatePermissions() {
-         this.perm.recalculatePermissions();
-+        getHandle().canPortalInstant = hasPermission("purpur.portal.instant"); // Purpur - Add portal permission bypass
-     }
- 
-     @Override

purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java.patch

@@ -1,22 +0,0 @@
-From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001
-From: File <noreply+automated@papermc.io>
-Date: Sun, 20 Apr 1997 05:37:42 -0800
-Subject: [PATCH] purpur paperServer File Patches
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
-index df332b6938b81822ba0436a7999ee448913e7c22..b366e40bf63e580b065c6917e17fd5c1eca5cedb 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
-@@ -258,4 +258,11 @@ public class CraftVillager extends CraftAbstractVillager implements Villager {
-     public void restock() {
-         getHandle().restock();
-     }
-+
-+    // Purpur start - Lobotomize stuck villagers
-+    @Override
-+    public boolean isLobotomized() {
-+        return getHandle().isLobotomized();
-+    }
-+    // Purpur end - Lobotomize stuck villagers
- }

purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java.patch

@@ -1,21 +0,0 @@
-From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001
-From: File <noreply+automated@papermc.io>
-Date: Sun, 20 Apr 1997 05:37:42 -0800
-Subject: [PATCH] purpur paperServer File Patches
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java b/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java
-index a573499fb96cb08d96e0b20602fc423bfd0e2f52..eb9cbc29181ffc83acd556f26f2c0b4f227808ab 100644
---- a/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java
-@@ -46,4 +46,10 @@ public class CraftMapRenderer extends MapRenderer {
-         }
-     }
- 
-+    // Purpur start - Explorer Map API
-+    @Override
-+    public boolean isExplorerMap() {
-+        return this.worldMap.isExplorerMap;
-+    }
-+    // Purpur end - Explorer Map API
- }

purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/util/Versioning.java.patch

@@ -1,19 +0,0 @@
-From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001
-From: File <noreply+automated@papermc.io>
-Date: Sun, 20 Apr 1997 05:37:42 -0800
-Subject: [PATCH] purpur paperServer File Patches
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-index 774556a62eb240da42e84db4502e2ed43495be17..e34ceaa77c7e538c8d6bc341c4c6f450488ce426 100644
---- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-@@ -11,7 +11,7 @@ public final class Versioning {
-     public static String getBukkitVersion() {
-         String result = "Unknown-Version";
- 
--        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/io.papermc.paper/paper-api/pom.properties");
-+        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/org.purpurmc.purpur/purpur-api/pom.properties"); // Purpur - Rebrand
-         Properties properties = new Properties();
- 
-         if (stream != null) {