From 45a09f79f2e3ca5b308173efa2eb922b5c732ce2 Mon Sep 17 00:00:00 2001
From: MrFishCakes <FinlayOxby@outlook.com>
Date: Mon, 18 Sep 2023 23:07:00 +0100
Subject: [PATCH] Updated Upstream (Purpur)

Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@07b13f2 Updated Upstream (Paper)
PurpurMC/Purpur@b0a7353 Updated Upstream (Paper)
---
 gradle.properties                             |  4 ++--
 .../server/0002-Graphite-Configuration.patch  | 24 +++++++++----------
 .../server/0007-Raw-Ore-Block-Smelting.patch  |  4 ++--
 patches/server/0013-Get-Random-Player.patch   |  4 ++--
 patches/server/0014-Global-EULA.patch         |  6 ++---
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index a9d4dd8..1393dcc 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,8 +1,8 @@
 group = org.graphitemc.graphite
 version = 1.20.1-R0.1-SNAPSHOT
 
-purpurCommit =  7927f53553abfa8c4d4bc4d5eb29dda44144f3dc
-previousCommit = 39bdf3d2e045857f328bd628f785c54be951e9bd
+purpurCommit = b0a7353a701d864b98296f9ccee79d39008860c4
+previousCommit = 7927f53553abfa8c4d4bc4d5eb29dda44144f3dc
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/server/0002-Graphite-Configuration.patch b/patches/server/0002-Graphite-Configuration.patch
index a4b5976..9990df4 100644
--- a/patches/server/0002-Graphite-Configuration.patch
+++ b/patches/server/0002-Graphite-Configuration.patch
@@ -98,7 +98,7 @@ index a0aa1f1a7adf986d500a2135aa42e138aa3c4f08..b9fe1410a91231daf5c0e66a8628f69e
 +    // Graphite end
  }
 diff --git a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
-index e471960e0443392f6f54732b052a4debf2a8fd97..19f1102de25054f2a8e7346c9ef78bc98115056e 100644
+index 2d3068b7748032342edd81e6ea4a7c08988fb28d..e38f0e5fa0190be80f00339766c9ef0fe1898ec3 100644
 --- a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
 +++ b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
 @@ -135,7 +135,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
@@ -110,7 +110,7 @@ index e471960e0443392f6f54732b052a4debf2a8fd97..19f1102de25054f2a8e7346c9ef78bc9
  
  
      public PaperConfigurations(final Path globalFolder) {
-@@ -300,7 +300,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
+@@ -303,7 +303,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
          }
      }
  
@@ -119,7 +119,7 @@ index e471960e0443392f6f54732b052a4debf2a8fd97..19f1102de25054f2a8e7346c9ef78bc9
          return createWorldContextMap(level.convertable.levelDirectory.path(), level.serverLevelData.getLevelName(), level.dimension().location(), level.spigotConfig);
      }
  
-@@ -401,6 +401,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
+@@ -404,6 +404,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
          return Files.exists(legacyConfig) && Files.isRegularFile(legacyConfig);
      }
  
@@ -127,7 +127,7 @@ index e471960e0443392f6f54732b052a4debf2a8fd97..19f1102de25054f2a8e7346c9ef78bc9
      @Deprecated
      public YamlConfiguration createLegacyObject(final MinecraftServer server) {
          YamlConfiguration global = YamlConfiguration.loadConfiguration(this.globalFolder.resolve(this.globalConfigFileName).toFile());
-@@ -410,7 +411,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
+@@ -413,7 +414,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
              worlds.set(level.getWorld().getName(), YamlConfiguration.loadConfiguration(getWorldConfigFile(level).toFile()));
          }
          return global;
@@ -136,7 +136,7 @@ index e471960e0443392f6f54732b052a4debf2a8fd97..19f1102de25054f2a8e7346c9ef78bc9
  
      @Deprecated
      public static YamlConfiguration loadLegacyConfigFile(File configFile) throws Exception {
-@@ -434,9 +435,15 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
+@@ -437,9 +438,15 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
      }
  
      // Symlinks are not correctly checked in createDirectories
@@ -262,7 +262,7 @@ index 221d1d0e1b4b46de6ebca5faac09bbda875fae17..c6b9451b60f117ef6d6cb5f63d9d5b57
          this.convertable = convertable_conversionsession;
          this.uuid = WorldUUID.getUUID(convertable_conversionsession.levelDirectory.path().toFile());
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 41b1abbd8a395f16ad20a425640b33ae27e07a83..b2b2382162f03d35e6319fc0cb80d205fb754a51 100644
+index 2cabe12c52dc67df41bcf1295f4927ad4d9542e0..1f55e9cab1c40d510cc1b0ba07d2ed6bea861eae 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -328,9 +328,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -277,7 +277,7 @@ index 41b1abbd8a395f16ad20a425640b33ae27e07a83..b2b2382162f03d35e6319fc0cb80d205
          this.purpurConfig = new org.purpurmc.purpur.PurpurWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName(), env); // Purpur
          this.playerBreedingCooldowns = this.getNewBreedingCooldownCache(); // Purpur
          this.generator = gen;
-@@ -1629,4 +1630,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1640,4 +1641,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          return getWorld().getEnvironment() == org.bukkit.World.Environment.THE_END;
      }
      // Purpur end
@@ -290,7 +290,7 @@ index 41b1abbd8a395f16ad20a425640b33ae27e07a83..b2b2382162f03d35e6319fc0cb80d205
 +    // Graphite end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b2cac8043e2b006ab2f07e3672b0a0c3cd449def..e63fa71d64996aeb7df361872eacdf3541706ae9 100644
+index f5dc9cf23b49a48b51b862b6418d963a7dedb7b8..b61c2d513ea472ecb46a66a81e019734c38f03ef 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -24,7 +24,6 @@ import java.io.FileNotFoundException;
@@ -309,7 +309,7 @@ index b2cac8043e2b006ab2f07e3672b0a0c3cd449def..e63fa71d64996aeb7df361872eacdf35
  import org.bukkit.plugin.messaging.Messenger;
  import org.bukkit.plugin.messaging.StandardMessenger;
  import org.bukkit.potion.Potion;
-@@ -1071,6 +1069,7 @@ public final class CraftServer implements Server {
+@@ -1049,6 +1047,7 @@ public final class CraftServer implements Server {
  
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
          this.console.paperConfigurations.reloadConfigs(this.console);
@@ -317,7 +317,7 @@ index b2cac8043e2b006ab2f07e3672b0a0c3cd449def..e63fa71d64996aeb7df361872eacdf35
          org.purpurmc.purpur.PurpurConfig.init((File) console.options.valueOf("purpur-settings")); // Purpur
          for (ServerLevel world : this.console.getAllLevels()) {
              // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
-@@ -1103,6 +1102,7 @@ public final class CraftServer implements Server {
+@@ -1081,6 +1080,7 @@ public final class CraftServer implements Server {
          this.reloadData();
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
          io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
@@ -325,7 +325,7 @@ index b2cac8043e2b006ab2f07e3672b0a0c3cd449def..e63fa71d64996aeb7df361872eacdf35
          org.purpurmc.purpur.PurpurConfig.registerCommands(); // Purpur
          this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
-@@ -3015,6 +3015,12 @@ public final class CraftServer implements Server {
+@@ -2993,6 +2993,12 @@ public final class CraftServer implements Server {
              return getProperties().properties;
          }
          // Purpur end
@@ -339,7 +339,7 @@ index b2cac8043e2b006ab2f07e3672b0a0c3cd449def..e63fa71d64996aeb7df361872eacdf35
          @Override
          public void restart() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 9a3374a1236164194ef0df43ed639296cbe1c731..3d235b51c4707a414d6118733f96753363b7ba22 100644
+index 4bc0a370c7aec06d30b4ebf7fa7d73263d0543bc..484e4a930b801c3f295a4cb38f0ccf50dc07b336 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -186,6 +186,13 @@ public class Main {
diff --git a/patches/server/0007-Raw-Ore-Block-Smelting.patch b/patches/server/0007-Raw-Ore-Block-Smelting.patch
index e06eb80..0fcfe7c 100644
--- a/patches/server/0007-Raw-Ore-Block-Smelting.patch
+++ b/patches/server/0007-Raw-Ore-Block-Smelting.patch
@@ -95,10 +95,10 @@ index 997d0fab71eacc6466ffe3bc8f6349e5813d6d49..a26c1556c7d5995c424f0719379b047e
 +    // Graphite end - Smelt Raw Ore Blocks
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e63fa71d64996aeb7df361872eacdf3541706ae9..7f383d80c7eae09d630457f14bc02b6730ef085c 100644
+index b61c2d513ea472ecb46a66a81e019734c38f03ef..dcae9fa8f318c5e85ce175106b07812a25636430 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1103,6 +1103,7 @@ public final class CraftServer implements Server {
+@@ -1081,6 +1081,7 @@ public final class CraftServer implements Server {
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
          io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
          org.graphitemc.graphite.command.GraphiteCommands.registerCommands(this.console); // Graphite
diff --git a/patches/server/0013-Get-Random-Player.patch b/patches/server/0013-Get-Random-Player.patch
index 37dd14b..c52b30b 100644
--- a/patches/server/0013-Get-Random-Player.patch
+++ b/patches/server/0013-Get-Random-Player.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Get Random Player
 Adds a method to fetch a random online player
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7f383d80c7eae09d630457f14bc02b6730ef085c..4946599a03a0aca24fb29a157fac70faa10a7a83 100644
+index dcae9fa8f318c5e85ce175106b07812a25636430..dd4a7a0864acdc739696a5e0173ad76528600d02 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -3248,4 +3248,11 @@ public final class CraftServer implements Server {
+@@ -3226,4 +3226,11 @@ public final class CraftServer implements Server {
          return getServer().lagging;
      }
      // Purpur end
diff --git a/patches/server/0014-Global-EULA.patch b/patches/server/0014-Global-EULA.patch
index 88744e2..986f43a 100644
--- a/patches/server/0014-Global-EULA.patch
+++ b/patches/server/0014-Global-EULA.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Global EULA
 Allows server owners to user a single global EULA file
 
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index dae36c6452ccd57a436dd918547b64d59957ab0a..8b6581b9d51479f082d2e80bd9141ba386e6c966 100644
+index f8d1631b274751a60d429f847ca7689e17adf1a2..12631a7174fdb9b8792caf0fb76cbbae2553ba7a 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
-@@ -131,7 +131,7 @@ public class Main {
+@@ -142,7 +142,7 @@ public class Main {
              DedicatedServerSettings dedicatedserversettings = new DedicatedServerSettings(optionset); // CraftBukkit - CLI argument support
  
              dedicatedserversettings.forceSave();
@@ -18,7 +18,7 @@ index dae36c6452ccd57a436dd918547b64d59957ab0a..8b6581b9d51479f082d2e80bd9141ba3
              Eula eula = new Eula(path2);
              // Paper start - load config files for access below if needed
              org.bukkit.configuration.file.YamlConfiguration bukkitConfiguration = io.papermc.paper.configuration.PaperConfigurations.loadLegacyConfigFile((File) optionset.valueOf("bukkit-settings"));
-@@ -169,7 +169,15 @@ public class Main {
+@@ -180,7 +180,15 @@ public class Main {
                  Main.LOGGER.info("You need to agree to the EULA in order to run the server. Go to eula.txt for more info.");
                  return;
              }