From 14f3871afe8803b84c138806a17a6dfed6d2b73b Mon Sep 17 00:00:00 2001
From: MrFishCakes <FinlayOxby@outlook.com>
Date: Tue, 29 Aug 2023 22:30:55 +0100
Subject: [PATCH] Updated Upstream (Purpur)

Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@9096b8d option for turning sand into glass using lightning
PurpurMC/Purpur@88d6ce4 make the diff smaller
PurpurMC/Purpur@9efce10 put everything behind options
PurpurMC/Purpur@7a6cbff Revert "put everything behind options"
PurpurMC/Purpur@c267ad3 Revert "make the diff smaller"
PurpurMC/Purpur@6e2126f Revert "option for turning sand into glass using lightning"
PurpurMC/Purpur@423c2af Updated Upstream (Paper)
---
 patches/server/0002-Graphite-Configuration.patch | 8 ++++----
 patches/server/0007-Raw-Ore-Block-Smelting.patch | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/patches/server/0002-Graphite-Configuration.patch b/patches/server/0002-Graphite-Configuration.patch
index 5b9d38e..54b7488 100644
--- a/patches/server/0002-Graphite-Configuration.patch
+++ b/patches/server/0002-Graphite-Configuration.patch
@@ -154,10 +154,10 @@ index e471960e0443392f6f54732b052a4debf2a8fd97..19f1102de25054f2a8e7346c9ef78bc9
 +    // Graphite end
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 99fd775e7a564aaef327a62bb7742da07b2d2829..3fae117993ed82ab59353852c8bdd952c19a6d28 100644
+index e6ddf69ade7ae51640569150f7db10d1afa63691..a36d407a10763c8ac3d57b194243e4fbdb2b273d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -307,6 +307,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -306,6 +306,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public final double[] recentTps = new double[ 4 ]; // Purpur
      // Spigot end
      public final io.papermc.paper.configuration.PaperConfigurations paperConfigurations;
@@ -165,7 +165,7 @@ index 99fd775e7a564aaef327a62bb7742da07b2d2829..3fae117993ed82ab59353852c8bdd952
      public static long currentTickLong = 0L; // Paper
      public boolean lagging = false; // Purpur
      protected boolean upnp = false; // Purpur
-@@ -413,6 +414,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -412,6 +413,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          // Paper end
          Runtime.getRuntime().addShutdownHook(new org.bukkit.craftbukkit.util.ServerShutdownThread(this));
          this.paperConfigurations = services.paperConfigurations(); // Paper
@@ -217,7 +217,7 @@ index a9b2c8cd4dcd3f884e4306bebee9334d3848fce5..2345699a770c091a3455ddbc022fc63e
      }
  
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 12124d6fbc0406bb62bd95a0f7bab68afa43377c..d2b20a59fb35c985fe97288b1cbe1d8a6bfc92ba 100644
+index 2a70abb9e0af502885593df1e732887cd9d2ce4d..751eac0e8746c4c804ced32f42a2b6973c20bb6e 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -209,6 +209,11 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0007-Raw-Ore-Block-Smelting.patch b/patches/server/0007-Raw-Ore-Block-Smelting.patch
index 623ce8d..e06eb80 100644
--- a/patches/server/0007-Raw-Ore-Block-Smelting.patch
+++ b/patches/server/0007-Raw-Ore-Block-Smelting.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Raw Ore Block Smelting
 One raw ore block will smelt into 9 ingots of the type. Can be toggeled per-world for each raw ore type
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index d2b20a59fb35c985fe97288b1cbe1d8a6bfc92ba..a4690357bec1e88d5c3c1a0112c64f0f32fa25e3 100644
+index 751eac0e8746c4c804ced32f42a2b6973c20bb6e..81f8c299c62efd9e0e5b6ec4da5eaf288b630d7f 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -386,6 +386,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -385,6 +385,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
              if (gg.pufferfish.pufferfish.PufferfishConfig.enableAsyncMobSpawning) mobSpawnExecutor.start(); // Pufferfish
              org.purpurmc.purpur.task.BossBarTask.startAll(); // Purpur
              org.purpurmc.purpur.task.BeehiveTask.instance().register(); // Purpur
@@ -95,7 +95,7 @@ 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 a5bd34d71a2097cd1541917d45ab34a70d09b4ca..b21cd4b8417bbb3f4edcf0a0e43ed8d3585e932e 100644
+index e63fa71d64996aeb7df361872eacdf3541706ae9..7f383d80c7eae09d630457f14bc02b6730ef085c 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 {