Updated Upstream (Purpur)

Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@2a50638 Updated Upstream (Paper)

build.gradle.kts

@@ -3,7 +3,7 @@ import io.papermc.paperweight.util.constants.PAPERCLIP_CONFIG
 plugins {
     java
     `maven-publish`
-    id("io.papermc.paperweight.patcher") version "1.7.2-SNAPSHOT"
+    id("io.papermc.paperweight.patcher") version "1.7.3"
 }
 
 val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"

gradle.properties

@@ -2,7 +2,7 @@ group = space.bxteam.divinemc
 
 mcVersion = 1.21.1
 version = 1.21.1-R0.1-SNAPSHOT
-purpurRef = 501e7c5124f030bd7c011a3a36fb92d5a6ec3dda
+purpurRef = 2a50638047508494d4289ca66fbbc094a388a710
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/server/0003-Optimize-default-values-for-configs.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Optimize default values for configs
 
 
 diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index 690086adcb1f87adc0b3ab664fde735ad3e1093a..e5eecd15040d4c0a7c8a0de166e5dddb84f35974 100644
+index a9dd0e5216e95afd98fd2200d110e2cc0b1b0dca..06b75003e88363aa3902cfef97b3bd3efc43fec9 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-@@ -339,9 +339,9 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -346,9 +346,9 @@ public class GlobalConfiguration extends ConfigurationPart {
          public boolean fixEntityPositionDesync = true;
          public boolean loadPermissionsYmlBeforePlugins = true;
          @Constraints.Min(4)

patches/server/0015-vmp-skip-entity-move-if-movement-is-zero.patch

@@ -7,7 +7,7 @@ Original code by RelativityMC, licensed under MIT
 You can find the original code on https://github.com/RelativityMC/VMP-fabric (Yarn mappings)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ec22afe908a303e3b0a27b387e59d11efe2eebf3..e11a89cf6c056ec947f56a5e2c027052d7261d4b 100644
+index bf1d86088c7e77d15977ba81ed88697e45603345..e9e68d3d7ef7e1e2c9c633e3cbf37c9dfc9b45d9 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -323,6 +323,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -31,7 +31,7 @@ index ec22afe908a303e3b0a27b387e59d11efe2eebf3..e11a89cf6c056ec947f56a5e2c027052
          final Vec3 originalMovement = movement; // Paper - Expose pre-collision velocity
          // Paper start - detailed watchdog information
          ca.spottedleaf.moonrise.common.util.TickThread.ensureTickThread("Cannot move an entity off-main");
-@@ -4215,6 +4222,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4217,6 +4224,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      }
  
      public final void setBoundingBox(AABB boundingBox) {

patches/server/0028-Delete-Timings.patch

@@ -731,7 +731,7 @@ index 24121a43aeb5e9bce013f30c92dddd15f99736c6..791cb04a13597eee4dbd28fabe2835ab
              String content = context.getRange().get(context.getInput());
              String[] args = org.apache.commons.lang3.StringUtils.split(content, ' '); // fix adjacent spaces (from console/plugins) causing empty array elements
 diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index e5eecd15040d4c0a7c8a0de166e5dddb84f35974..9367886f9a313691b7bce16674f609e7b4975659 100644
+index 06b75003e88363aa3902cfef97b3bd3efc43fec9..3bbd408290e1058d6dfcdc797eb4e3a5e93b747a 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 @@ -1,6 +1,5 @@
@@ -827,7 +827,7 @@ index 01efbc507b3d58f13f78ee286f93df40cdc3f0cb..1f7f68aad97ee73763c042837f239bdc
                      } catch (Exception exception) {
                          if (exception instanceof ReportedException) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 6fb35c36d964c96a42911b8a9e11590aaa5cca59..78967841b5f9bc7d1a45684d5fd85d8f5542899b 100644
+index 4bcb20cd6cd971f25327ec1322bb172f036a54a4..704f8509ca70d8e1961c87090858a8a3cab4c886 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -3,7 +3,6 @@ package net.minecraft.server;
@@ -847,7 +847,7 @@ index 6fb35c36d964c96a42911b8a9e11590aaa5cca59..78967841b5f9bc7d1a45684d5fd85d8f
  public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTask> implements ServerInfo, ChunkIOErrorReporter, CommandSource, AutoCloseable, ca.spottedleaf.moonrise.patches.chunk_system.server.ChunkSystemMinecraftServer { // Paper - rewrite chunk system
  
      private static MinecraftServer SERVER; // Paper
-@@ -1043,7 +1040,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1042,7 +1039,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
          MinecraftServer.LOGGER.info("Stopping server");
          Commands.COMMAND_SENDING_POOL.shutdownNow(); // Paper - Perf: Async command map building; Shutdown and don't bother finishing
@@ -855,7 +855,7 @@ index 6fb35c36d964c96a42911b8a9e11590aaa5cca59..78967841b5f9bc7d1a45684d5fd85d8f
          this.server.spark.disable(); // Paper - spark
          // Purpur start
          if (upnp) {
-@@ -1617,15 +1613,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1615,15 +1611,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public void tickServer(BooleanSupplier shouldKeepTicking) {
@@ -873,7 +873,7 @@ index 6fb35c36d964c96a42911b8a9e11590aaa5cca59..78967841b5f9bc7d1a45684d5fd85d8f
          // Paper end
          this.server.spark.tickStart(); // Paper - spark
          new com.destroystokyo.paper.event.server.ServerTickStartEvent(this.tickCount+1).callEvent(); // Paper - Server Tick Events
-@@ -1662,9 +1657,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1660,9 +1655,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          //this.profiler.pop(); // Purpur
          // Paper end - Incremental chunk and player saving
          // Paper start - move executeAll() into full server tick timing
@@ -884,7 +884,7 @@ index 6fb35c36d964c96a42911b8a9e11590aaa5cca59..78967841b5f9bc7d1a45684d5fd85d8f
          // Paper end
          // Paper start - Server Tick Events
          long endTime = System.nanoTime();
-@@ -1688,7 +1681,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1686,7 +1679,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.logTickMethodTime(i);
          //this.profiler.pop(); // Purpur
          org.spigotmc.WatchdogThread.tick(); // Spigot
@@ -940,7 +940,7 @@ index 857c8bd79b2d9a634db25408d7305968e29f9846..82c7563de4c947c7ee3331112720ad71
  import com.google.common.collect.ImmutableList.Builder;
  import com.google.common.collect.Iterables;
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index c601061d1abb8f4a66dd5e478cf69a872a4d0f6f..ab0f96229a79e3832b19e9becbfaaceeab34254b 100644
+index 067b10134b087626e05596225744b905211e8b63..c093aa5f957083cf288843ea0cb4a5ae77c7fa69 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1,7 +1,6 @@
@@ -970,7 +970,7 @@ index c601061d1abb8f4a66dd5e478cf69a872a4d0f6f..ab0f96229a79e3832b19e9becbfaacee
          entity.postTick(); // CraftBukkit
          } else { entity.inactiveTick(); } // Paper - EAR 2
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index e4978abcc79ee51fa95442b82d9079c8ee1e60d6..73c6b53ef3db85aa3b2ac31013340878e2dd158d 100644
+index 6f4e471c45195996a1cdd93c7dfb64e68156212f..26ea6c68ed79f07c1fc17a248663c111780417ec 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1,6 +1,5 @@
@@ -1009,7 +1009,7 @@ index d3de0362dd1ef3954d05c4d8fa56a25edfe1bb2b..6ac3dfab99cfb0b51c81cc20e71da126
          return this != EntityType.PLAYER && this != EntityType.LLAMA_SPIT && this != EntityType.WITHER && this != EntityType.BAT && this != EntityType.ITEM_FRAME && this != EntityType.GLOW_ITEM_FRAME && this != EntityType.LEASH_KNOT && this != EntityType.PAINTING && this != EntityType.END_CRYSTAL && this != EntityType.EVOKER_FANGS;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 9385a5a61fdd2e623e7a3ced7bec8cae8013e419..cb2885da87d0b2073d8dbd35353f16983120b57e 100644
+index b3977acc926657847d76f098420189b8b3d6ad74..1960aacbc7f12e675e0ba58aa7b5c29a6f0f7791 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -157,7 +157,6 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -1061,7 +1061,7 @@ index 09a7b418ddf564c0be13297f7c216db2e7ae1578..1e26b1099139d76e49fce14ee72061e1
          this.scanRate = senseInterval;
          this.timeToTick = (long)RANDOM.nextInt(senseInterval);
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index b273790be3d478a2aa431ba26edf8ad47164d6d7..c22f667473032c2ec861759ea9ae2de30e7037be 100644
+index e90304a1bd97709e8e639835ef062da154092ed1..fb484fe2f491898917965bbd865e1540ddf92c98 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -176,7 +176,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl

patches/server/0037-Block-Log4Shell-exploit.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Block Log4Shell exploit
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 50b4e3fb244b8bac1a6a6d90aaf3b4be075b2500..4e844772b0343633ba44299544e77c012a1de888 100644
+index 682f353c0e409fcc7375efc62d9f64b4952ff230..5fafd0e97c27cd92c6dd1e1cb3a68a290e15353e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2424,6 +2424,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2432,6 +2432,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
      }
  
      private void tryHandleChat(String s, Runnable runnable, boolean sync) { // CraftBukkit
@@ -16,7 +16,7 @@ index 50b4e3fb244b8bac1a6a6d90aaf3b4be075b2500..4e844772b0343633ba44299544e77c01
          if (ServerGamePacketListenerImpl.isChatMessageIllegal(s)) {
              this.disconnect((Component) Component.translatable("multiplayer.disconnect.illegal_characters"), org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_CHARACTERS); // Paper
          } else if (this.player.isRemoved() || this.player.getChatVisibility() == ChatVisiblity.HIDDEN) { // CraftBukkit - dead men tell no tales
-@@ -2455,6 +2456,15 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2463,6 +2464,15 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          }
      }
  
@@ -33,7 +33,7 @@ index 50b4e3fb244b8bac1a6a6d90aaf3b4be075b2500..4e844772b0343633ba44299544e77c01
          for (int i = 0; i < message.length(); ++i) {
              if (!StringUtil.isAllowedChatCharacter(message.charAt(i))) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 37fc08d04ff3514d27ad25c8d774a6e96b30c3b1..3ab958a84a8f13eeaa5f3d6003d1d389fccd5384 100644
+index 173e4a075078af67f030750c9a6294ab3f796677..370612b9c787104f346760978179f853c210ee0a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -751,6 +751,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

patches/server/0056-Implement-Linear-region-format.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Implement Linear region format
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 2d98802c9f9bcc07458f6c44d4ba73d44fe943de..6aeafa7540fafa7d4dc851181b73b1aff135491b 100644
+index 8ef05c4ba140586c8ce8ba892dfb9b658d4b604f..b8cdedc81a2ac5128f2c6ea7eb4d5df22c136748 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -30,6 +30,10 @@ dependencies {
@@ -63,10 +63,10 @@ index 3218cbf84f54daf06e84442d5eb1a36d8da6b215..0db1f8f64a261780e6692755669fa573
              synchronized (cache) {
                  regionFile = ((ChunkSystemRegionFileStorage)(Object)cache).moonrise$getRegionFileIfLoaded(chunkX, chunkZ);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 78967841b5f9bc7d1a45684d5fd85d8f5542899b..d5232959ad9f7daed9fc46a305692029d35e8745 100644
+index 704f8509ca70d8e1961c87090858a8a3cab4c886..c437a1c6a80a2f870f01c8c824fa43c693586552 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -982,10 +982,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -981,10 +981,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              while (iterator1.hasNext()) {
                  ServerLevel worldserver2 = (ServerLevel) iterator1.next();
  
@@ -129,7 +129,7 @@ index cb39c629af1827078f35904a373d35a63fea17ff..08a4a333ab294e95bee95376788df522
      }
  
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
-index eb0389ad86300665b6e057bcfa1d7c068dc6c6ab..bb3730bd34d40d079ff50fd40bf7b0c35589243f 100644
+index 1e0439cf3f4008fa430acb90b45f5bc4cdd6d7f2..05b356177fc0f65de51f03f7ef1a2f03d85e92ff 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
 @@ -28,7 +28,7 @@ import net.minecraft.nbt.NbtIo; // Paper