Updated Upstream (Purpur)

Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@6f5bbae5 [ci/skip] move some code around
PurpurMC/Purpur@5c1a9835 fix issue with `shift-right-click-repairs-mending-points`
PurpurMC/Purpur@3156e446 check damage value of tool correctly
PurpurMC/Purpur@a9fe4f25 Updated Upstream (Paper)

divinemc-api/paper-patches/features/0002-Delete-Timings.patch

@@ -2870,10 +2870,10 @@ index 3e61a926620a67daec3af54b72a1b911eaef2ed4..00000000000000000000000000000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index 71eb845a4d3b8b6ec3b816a0f20ec807e0f9a86d..a43419c23aa0f6fd809caf5a841cb138f350b7ba 100644
+index 27a7c69f23084e821d945d5e97e51a94ddd94e58..d645ee8470a2dd9f7b8eff2b7ff2211aba9c342f 100644
 --- a/src/main/java/org/bukkit/command/Command.java
 +++ b/src/main/java/org/bukkit/command/Command.java
-@@ -33,16 +33,6 @@ public abstract class Command {
+@@ -32,16 +32,6 @@ public abstract class Command {
      protected String usageMessage;
      private String permission;
      private net.kyori.adventure.text.Component permissionMessage; // Paper
@@ -2891,10 +2891,10 @@ index 71eb845a4d3b8b6ec3b816a0f20ec807e0f9a86d..a43419c23aa0f6fd809caf5a841cb138
      protected Command(@NotNull String name) {
          this(name, "", "/" + name, new ArrayList<String>());
 diff --git a/src/main/java/org/bukkit/command/FormattedCommandAlias.java b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
-index abe256e1e45ce28036da4aa1586715bc8a1a3414..9eab8024e0675865f17669847759a26d28f74f3a 100644
+index 59fada9b1eb78238d280c6bbb711f52facba52c6..eb4d78c6111a530d015a0b91d14c40ad0eec9ca7 100644
 --- a/src/main/java/org/bukkit/command/FormattedCommandAlias.java
 +++ b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
-@@ -12,7 +12,6 @@ public class FormattedCommandAlias extends Command {
+@@ -14,7 +14,6 @@ public class FormattedCommandAlias extends Command {
  
      public FormattedCommandAlias(@NotNull String alias, @NotNull String[] formatStrings) {
          super(alias);
@@ -2902,7 +2902,7 @@ index abe256e1e45ce28036da4aa1586715bc8a1a3414..9eab8024e0675865f17669847759a26d
          this.formatStrings = formatStrings;
      }
  
-@@ -120,10 +119,6 @@ public class FormattedCommandAlias extends Command {
+@@ -122,10 +121,6 @@ public class FormattedCommandAlias extends Command {
          return formatString.trim(); // Paper - Causes an extra space at the end, breaks with brig commands
      }
  

divinemc-server/minecraft-patches/features/0006-Multithreaded-Tracker.patch

@@ -211,10 +211,10 @@ index c03895b2fc783d748fe52660b9ef30367143d0f5..8fa3af0ebcb92138d0dae858c131db0a
                          }
                      }
 diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d44366b8d1e715c6778e786afc62ae588c873a0d..8386c37abdd895c885afff75d03e19f4317e9828 100644
+index d94a82f02bfebd023780d0005f7069c770779f16..c9f714d8aec6460e663c7ce24bc185ea45b56990 100644
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1882,7 +1882,7 @@ public class ServerGamePacketListenerImpl
+@@ -1884,7 +1884,7 @@ public class ServerGamePacketListenerImpl
      }
  
      public void internalTeleport(PositionMoveRotation posMoveRotation, Set<Relative> relatives) {
@@ -262,7 +262,7 @@ index 23576e631ad4a12ec3ff3630be253738534588f3..b37a49c44ecb456c798d153fddf3cb60
      private final net.minecraft.world.entity.LivingEntity entity; // Purpur - Ridables
  
 diff --git a/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java b/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
-index 3ae69b17fec1cdb2bee2b5a795026a875f197c30..f8620d34137fe13122deb5b761512e09bb8c4aa7 100644
+index 7bbeed6c998c91e68376d3f17a510d68e3cd0b27..de7b3a8a7c841360310a88005da02a0733b46714 100644
 --- a/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
 +++ b/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
 @@ -211,6 +211,7 @@ public class MapItemSavedData extends SavedData {

divinemc-server/minecraft-patches/features/0013-Option-to-allow-weird-movement-and-disable-teleporti.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Option to allow weird movement and disable teleporting
 
 
 diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b05657f763bbdbc9268c83d78c2da62b97d095e2..a271b76224246f04ad9396a3b3be40f5f7302965 100644
+index c9f714d8aec6460e663c7ce24bc185ea45b56990..376ae7bde8fdf0efed5a7d33f67a1a5ae3b5e6e7 100644
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -566,7 +566,7 @@ public class ServerGamePacketListenerImpl
@@ -27,7 +27,7 @@ index b05657f763bbdbc9268c83d78c2da62b97d095e2..a271b76224246f04ad9396a3b3be40f5
                      flag2 = true; // Paper - diff on change, this should be moved wrongly
                      LOGGER.warn("{} (vehicle of {}) moved wrongly! {}", rootVehicle.getName().getString(), this.player.getName().getString(), Math.sqrt(d7));
                  }
-@@ -1510,20 +1510,24 @@ public class ServerGamePacketListenerImpl
+@@ -1512,20 +1512,24 @@ public class ServerGamePacketListenerImpl
                                      if (this.shouldCheckPlayerMovement(isFallFlying)) {
                                          float f2 = isFallFlying ? 300.0F : 100.0F;
                                          if (d7 - d6 > Math.max(f2, Mth.square(org.spigotmc.SpigotConfig.movedTooQuicklyMultiplier * (float) i * speed))) {
@@ -63,7 +63,7 @@ index b05657f763bbdbc9268c83d78c2da62b97d095e2..a271b76224246f04ad9396a3b3be40f5
                                          }
                                      }
                                  }
-@@ -1584,6 +1588,7 @@ public class ServerGamePacketListenerImpl
+@@ -1586,6 +1590,7 @@ public class ServerGamePacketListenerImpl
                                  d7 = d3 * d3 + d4 * d4 + d5 * d5;
                                  boolean movedWrongly = false; // Paper - Add fail move event; rename
                                  if (!this.player.isChangingDimension()

divinemc-server/minecraft-patches/features/0018-Block-Log4Shell-exploit.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Block Log4Shell exploit
 
 
 diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index aecce706f3814b458cf152afd88e3378b3f93d0c..49c7c016ef2060a0ae97a3e62ad3c3269e219998 100644
+index 376ae7bde8fdf0efed5a7d33f67a1a5ae3b5e6e7..ce8255db82335255313e16b9811bdfc39d33e5ee 100644
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2480,6 +2480,7 @@ public class ServerGamePacketListenerImpl
+@@ -2482,6 +2482,7 @@ public class ServerGamePacketListenerImpl
      }
  
      private void tryHandleChat(String message, Runnable handler, boolean sync) { // CraftBukkit
@@ -16,7 +16,7 @@ index aecce706f3814b458cf152afd88e3378b3f93d0c..49c7c016ef2060a0ae97a3e62ad3c326
          if (isChatMessageIllegal(message)) {
              this.disconnectAsync(Component.translatable("multiplayer.disconnect.illegal_characters"), org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_CHARACTERS); // Paper - add proper async disconnect
          } else if (this.player.isRemoved() || this.player.getChatVisibility() == ChatVisiblity.HIDDEN) { // CraftBukkit - dead men tell no tales
-@@ -2512,6 +2513,15 @@ public class ServerGamePacketListenerImpl
+@@ -2514,6 +2515,15 @@ public class ServerGamePacketListenerImpl
          }
      }
  

divinemc-server/minecraft-patches/features/0029-Option-to-disable-disconnect.spam.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Option to disable disconnect.spam
 
 
 diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 19666b5e56507597b8bfb11a4570901563bdf37f..35aa507b2c5eb780df8a169d2339811f8b208a26 100644
+index 8f6555d122c7d3f22b3f6e9874994d8fb1689cd3..c59ce58f526f9bc5a2912791a51bb5d09c250d8a 100644
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -812,7 +812,7 @@ public class ServerGamePacketListenerImpl
@@ -34,7 +34,7 @@ index 19666b5e56507597b8bfb11a4570901563bdf37f..35aa507b2c5eb780df8a169d2339811f
              && parseResults.getExceptions().values().stream().anyMatch(e -> e instanceof io.papermc.paper.brigadier.TagParseCommandSyntaxException)) {
              this.disconnect(Component.translatable("disconnect.spam"), org.bukkit.event.player.PlayerKickEvent.Cause.SPAM);
              return;
-@@ -2607,6 +2608,7 @@ public class ServerGamePacketListenerImpl
+@@ -2609,6 +2610,7 @@ public class ServerGamePacketListenerImpl
          // this.chatSpamThrottler.increment();
          if (!this.chatSpamThrottler.isIncrementAndUnderThreshold()
              // CraftBukkit end
@@ -42,7 +42,7 @@ index 19666b5e56507597b8bfb11a4570901563bdf37f..35aa507b2c5eb780df8a169d2339811f
              && !this.server.getPlayerList().isOp(this.player.getGameProfile())
              && !this.server.isSingleplayerOwner(this.player.getGameProfile())) {
              this.disconnectAsync(Component.translatable("disconnect.spam"), org.bukkit.event.player.PlayerKickEvent.Cause.SPAM); // Paper - kick event cause & add proper async disconnect
-@@ -3386,7 +3388,7 @@ public class ServerGamePacketListenerImpl
+@@ -3388,7 +3390,7 @@ public class ServerGamePacketListenerImpl
      public void handlePlaceRecipe(ServerboundPlaceRecipePacket packet) {
          // Paper start - auto recipe limit
          if (!org.bukkit.Bukkit.isPrimaryThread()) {

divinemc-server/minecraft-patches/features/0041-Optimize-Raids.patch

@@ -25,10 +25,10 @@ index 9c64da096bfd8325e0c8f692b8ae7f420096728a..d7ec2dd011a6728e7a1adb5a84f58790
  
      // Paper start
 diff --git a/net/minecraft/world/entity/raid/Raid.java b/net/minecraft/world/entity/raid/Raid.java
-index eb7208b03240d647ace22c41ac665d3030407196..f19ae5318b7d8e1225b19228bcdc7a93dd11c747 100644
+index 62a3a8d46e10e6f02e3f515bbce5d9ba1f6566b8..4d078e99e4128354abbe0a5fe386f5832148105c 100644
 --- a/net/minecraft/world/entity/raid/Raid.java
 +++ b/net/minecraft/world/entity/raid/Raid.java
-@@ -125,6 +125,7 @@ public class Raid {
+@@ -126,6 +126,7 @@ public class Raid {
      private Raid.RaidStatus status;
      private int celebrationTicks;
      private Optional<BlockPos> waveSpawnPos = Optional.empty();
@@ -36,7 +36,7 @@ index eb7208b03240d647ace22c41ac665d3030407196..f19ae5318b7d8e1225b19228bcdc7a93
  
      public Raid(BlockPos center, Difficulty difficulty) {
          this.active = true;
-@@ -277,6 +278,12 @@ public class Raid {
+@@ -278,6 +279,12 @@ public class Raid {
      }
  
      public void tick(ServerLevel level) {
@@ -49,7 +49,7 @@ index eb7208b03240d647ace22c41ac665d3030407196..f19ae5318b7d8e1225b19228bcdc7a93
          if (!this.isStopped()) {
              if (this.status == Raid.RaidStatus.ONGOING) {
                  boolean flag = this.active;
-@@ -587,7 +594,7 @@ public class Raid {
+@@ -588,7 +595,7 @@ public class Raid {
      }
  
      public void updateBossbar() {

divinemc-server/paper-patches/features/0002-Configuration.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Configuration
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d8cf1fdba569ea667f487c106b2fc950f4756780..0823182b857c7be24b29ca799669fa6c7d306c40 100644
+index 7c79e58f86d113e5e67947e235475beef76e20ab..dc58d8707b854e53acff7c8e185db7904505aaa5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1081,6 +1081,13 @@ public final class CraftServer implements Server {
+@@ -1088,6 +1088,13 @@ public final class CraftServer implements Server {
          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
@@ -22,7 +22,7 @@ index d8cf1fdba569ea667f487c106b2fc950f4756780..0823182b857c7be24b29ca799669fa6c
          for (ServerLevel world : this.console.getAllLevels()) {
              // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
              world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
-@@ -1097,6 +1104,13 @@ public final class CraftServer implements Server {
+@@ -1104,6 +1111,13 @@ public final class CraftServer implements Server {
              }
              world.spigotConfig.init(); // Spigot
              world.purpurConfig.init(); // Purpur - Purpur config files

divinemc-server/paper-patches/features/0004-Implement-Secure-Seed.patch

@@ -25,10 +25,10 @@ index 400e632208d133a3f49fc7f14bceb48a1026769b..4954625e4f1af358ca7c70a57be30dee
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0823182b857c7be24b29ca799669fa6c7d306c40..5e4609d9c29c43858b756097e71677bdf7a150f2 100644
+index dc58d8707b854e53acff7c8e185db7904505aaa5..4aadf1a020136dcf458e0470db141e24a0b7006e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1378,7 +1378,11 @@ public final class CraftServer implements Server {
+@@ -1385,7 +1385,11 @@ public final class CraftServer implements Server {
              registryAccess = levelDataAndDimensions.dimensions().dimensionsRegistryAccess();
          } else {
              LevelSettings levelSettings;

divinemc-server/paper-patches/features/0007-Optimize-canSee-checks.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Optimize canSee checks
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 6933e64ff1f22e4fc15bc745ff0bdb52a2091db6..666eeac7f4b9d92c1e867dc66f5439a187b005de 100644
+index 09fc84319df0adb741dc29092ae33768878c8676..e266222c30155bb792e62841acf009178811473c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -212,7 +212,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -17,7 +17,7 @@ index 6933e64ff1f22e4fc15bc745ff0bdb52a2091db6..666eeac7f4b9d92c1e867dc66f5439a1
      private final Set<UUID> unlistedEntities = new HashSet<>(); // Paper - Add Listing API for Player
      private static final WeakHashMap<Plugin, WeakReference<Plugin>> pluginWeakReferences = new WeakHashMap<>();
      private int hash = 0;
-@@ -2255,9 +2255,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2268,9 +2268,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public boolean canSee(org.bukkit.entity.Entity entity) {

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

@@ -1,25 +1,6 @@
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -448,9 +_,7 @@
+@@ -976,7 +_,7 @@
- 
-         this.configuration = YamlConfiguration.loadConfiguration(this.getConfigFile());
-         this.configuration.options().copyDefaults(true);
--        YamlConfiguration configurationDefaults = YamlConfiguration.loadConfiguration(new InputStreamReader(this.getClass().getClassLoader().getResourceAsStream("configurations/bukkit.yml"), StandardCharsets.UTF_8));
--        this.configuration.setDefaults(configurationDefaults);
--        this.configuration.options().setHeader(configurationDefaults.options().getHeader());
-+        this.configuration.setDefaults(YamlConfiguration.loadConfiguration(new InputStreamReader(this.getClass().getClassLoader().getResourceAsStream("configurations/bukkit.yml"), StandardCharsets.UTF_8)));
-         ConfigurationSection legacyAlias = null;
-         if (!this.configuration.isString("aliases")) {
-             legacyAlias = this.configuration.getConfigurationSection("aliases");
-@@ -467,7 +_,6 @@
-         if (this.commandsConfiguration.contains("aliases")) commandsDefaults.set("aliases", null);
-         this.commandsConfiguration.setDefaults(commandsDefaults);
-         // Paper end - don't enforce icanhasbukkit default if alias block exists
--        this.commandsConfiguration.options().setHeader(commandsDefaults.options().getHeader());
-         this.saveCommandsConfig();
- 
-         // Migrate aliases from old file and add previously implicit $1- to pass all arguments
-@@ -972,7 +_,7 @@
  
      @Override
      public List<World> getWorlds() {

gradle.properties

@@ -2,7 +2,7 @@ group = org.bxteam.divinemc
 version=1.21.5-R0.1-SNAPSHOT
 
 mcVersion=1.21.5
-purpurRef=c2f485914e648b50e8eee911aa9607fe7a1ae298
+purpurRef=a9fe4f259771306c2977e1fb4e9fbcb515abacd3
 experimental=true
 
 org.gradle.configuration-cache=true