Updated Upstream (Purpur)

Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@85e34e5 Updated Upstream (Paper)
PurpurMC/Purpur@ff80cf5 Updated Upstream (Paper)

gradle.properties

@@ -1,7 +1,7 @@
 group = gq.bxteam.divinemc
 
 version = 1.20.2-R0.1-SNAPSHOT
-purpurRef = 6bb7f82f3b685113c92ce6480e2ba698d05ab57c
+purpurRef = ff80cf53d514db49f4ea5a2d1132090a9fba37fa
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/api/0003-Optimize-Paper-Event-Manager.patch

@@ -97,10 +97,10 @@ index 3b3d9642a8d63798dc28f2f8df77f0466451cbff..9c43c51858b20ace8e32eb2d7f5a2fba
      }
  
 diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-index 7572a0bf6614b02be3cbccc7b86e52ee1b8df621..792b17119ce0dcf930920be3c16176def0db1454 100644
+index 90953bfc81168068a281be4d2d3942d5e7dd69ff..685d0c86a14c7a562a881f725add0fc5ac725f3f 100644
 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-@@ -309,4 +309,11 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
+@@ -323,4 +323,11 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
      }
  
      // Paper end

patches/server/0002-Divine-Configuration.patch

@@ -327,7 +327,7 @@ index 0000000000000000000000000000000000000000..5d16d2250bae9c982a0af9ad2580a635
 +}
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 21da8b6b0df40b6b88a325ced5d6553ad5912d31..97cc7dd902c343f95206c26d6d8d0c2d4821dd54 100644
+index a51306bb36d403ab627cd8b2fc8d8f7a3e6ca918..547c60bdb71ef7641273348b836f2feeab06bd9c 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -235,6 +235,16 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -348,7 +348,7 @@ index 21da8b6b0df40b6b88a325ced5d6553ad5912d31..97cc7dd902c343f95206c26d6d8d0c2d
          this.setFlightAllowed(dedicatedserverproperties.allowFlight);
          this.setMotd(dedicatedserverproperties.motd);
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index a90288a86b022b4f9682befcb1478671e861ca41..b83a6a2975a730e69e728e7b1d3ef2f68f2ac590 100644
+index 25540a7f5631acd856726cdb44bace9be7dab401..4ed2a063f21ae4bb840e5ec1f84e04221f753ca0 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -15,6 +15,8 @@ import java.util.function.Consumer;
@@ -377,7 +377,7 @@ index a90288a86b022b4f9682befcb1478671e861ca41..b83a6a2975a730e69e728e7b1d3ef2f6
          this.generator = gen;
          this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 061d4fb0d3c5e38b4bbf8e3f4be8b191fa720f25..775b29a31ebc846931a07a4cb67606f04100644e 100644
+index 0ac0184c4de16f8a6f2b83dd344e0607a5c6d8f5..b1adcc3a1fc14bd0daa9059d124e533a3b62ef41 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -15,6 +15,7 @@ import com.mojang.brigadier.tree.LiteralCommandNode;
@@ -389,7 +389,7 @@ index 061d4fb0d3c5e38b4bbf8e3f4be8b191fa720f25..775b29a31ebc846931a07a4cb67606f0
  import java.awt.image.BufferedImage;
  import java.io.ByteArrayOutputStream;
 @@ -1054,6 +1055,7 @@ public final class CraftServer implements Server {
-         org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
+         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
 +        gq.bxteam.divinemc.configuration.DivineConfig.init((File) console.options.valueOf("divinemc-settings")); // DivineMC
@@ -412,7 +412,7 @@ index 061d4fb0d3c5e38b4bbf8e3f4be8b191fa720f25..775b29a31ebc846931a07a4cb67606f0
          this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -2998,6 +3002,13 @@ public final class CraftServer implements Server {
+@@ -2999,6 +3003,13 @@ public final class CraftServer implements Server {
          }
          // Purpur end
  
@@ -427,7 +427,7 @@ index 061d4fb0d3c5e38b4bbf8e3f4be8b191fa720f25..775b29a31ebc846931a07a4cb67606f0
          public void restart() {
              org.spigotmc.RestartCommand.restart();
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 67c621fdc994b392dc961f79e1e3b97c2977adc4..693579ce7fa7fa6428af95bdf9e2b08ed459be7e 100644
+index f4bb177984f0c0223dbadf4fc7562040e4f74d6d..eef4a7ec24fd1be69e737c74f1f4267277fad9e1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -187,6 +187,14 @@ public class Main {

patches/server/0007-Fix-entity-serialization.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix entity serialization
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 0e192a128c87124956fcec552362ab763bac5e55..c7846eb58611354b9be29ea9a478c076d3f16620 100644
+index 067302709a2291274eeecd1e4e04662b6914da12..8ab1cfdf1a108a968ff81ce6ed08f9bc27ee7cd4 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2297,15 +2297,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -25,10 +25,10 @@ index 0e192a128c87124956fcec552362ab763bac5e55..c7846eb58611354b9be29ea9a478c076
          return this.isPassenger() ? false : this.saveAsPassenger(nbt);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 33ea5172bb7fe1018bc39acc16963f4998ac52b2..d4f88fcb3081f30ef1c4f209097f8cea8d8579d5 100644
+index 61f3f9550f0e2e62515502ccc5e7b90178a5db47..285f6e0afdf11fd6195c18638f7367c466bcf8e6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -488,8 +488,13 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -501,8 +501,13 @@ public final class CraftMagicNumbers implements UnsafeValues {
          Preconditions.checkNotNull(entity, "null cannot be serialized");
          Preconditions.checkArgument(entity instanceof org.bukkit.craftbukkit.entity.CraftEntity, "only CraftEntities can be serialized");
  

patches/server/0010-Remove-Spigot-tick-limiter.patch

@@ -7,7 +7,7 @@ Original code by Titaniumtown, modified by NONPLAYT
 You can find the original code on https://gitlab.com/Titaniumtown/JettPack
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index b83a6a2975a730e69e728e7b1d3ef2f68f2ac590..59731b895d2b77552b4576ce559d6e43b8d8631e 100644
+index 4ed2a063f21ae4bb840e5ec1f84e04221f753ca0..96c6195713127f41b4f60f9ed0d99543e3f147d2 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -182,8 +182,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -21,15 +21,15 @@ index b83a6a2975a730e69e728e7b1d3ef2f68f2ac590..59731b895d2b77552b4576ce559d6e43
      public java.util.ArrayDeque<net.minecraft.world.level.block.RedstoneTorchBlock.Toggle> redstoneUpdateInfos; // Paper - Move from Map in BlockRedstoneTorch to here
 @@ -346,8 +344,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          // CraftBukkit end
-         timings = new co.aikar.timings.WorldTimingsHandler(this); // Paper - code below can generate new world and access timings
+         this.timings = new co.aikar.timings.WorldTimingsHandler(this); // Paper - code below can generate new world and access timings
          this.keepSpawnInMemory = this.paperConfig().spawn.keepSpawnLoaded; // Paper
--        this.entityLimiter = new org.spigotmc.TickLimiter(spigotConfig.entityMaxTickTime);
+-        this.entityLimiter = new org.spigotmc.TickLimiter(this.spigotConfig.entityMaxTickTime);
--        this.tileLimiter = new org.spigotmc.TickLimiter(spigotConfig.tileMaxTickTime);
+-        this.tileLimiter = new org.spigotmc.TickLimiter(this.spigotConfig.tileMaxTickTime);
          this.chunkPacketBlockController = this.paperConfig().anticheat.antiXray.enabled ? new com.destroystokyo.paper.antixray.ChunkPacketBlockControllerAntiXray(this, executor) : com.destroystokyo.paper.antixray.ChunkPacketBlockController.NO_OPERATION_INSTANCE; // Paper - Anti-Xray
          // Paper start - optimise collisions
          this.minSection = io.papermc.paper.util.WorldUtil.getMinSection(this);
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 389bcb5e01d66f8e3915e09a49aace5176012191..d5271bc912632e694a10897717460893a1badf04 100644
+index 12358c08e0e90d8d01db25534c6d5c4e726191dc..0bfdd15c71ed2fa866b6d4f201dd87b14e2a2f89 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -450,6 +450,7 @@ public class SpigotWorldConfig