Updated Upstream (Purpur)

Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@0493ac3 Updated Upstream (Paper)

gradle.properties

@@ -2,7 +2,7 @@ group = space.bxteam.divinemc
 
 mcVersion = 1.21.3
 version = 1.21.3-R0.1-SNAPSHOT
-purpurRef = 03062a856ed0c3603e2e8b69ebd0b36c8a6942d1
+purpurRef = 0493ac329ff82fd31412d34bd8f85ab2aababb24
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/server/0001-Divine-Branding.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Divine Branding
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index c673a2cf682378aac38d047b999d8a1731f7569d..41dd8c9e0382b4109a32ad55f68ba391a87a346b 100644
+index 77602e4445b1b45a17e5552ac6a769e0ed46ebc7..3d0d3a3eb090041b461d65f66e47e39fab27aa82 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -25,7 +25,7 @@ abstract class MockitoAgentProvider : CommandLineArgumentProvider {
@@ -17,7 +17,7 @@ index c673a2cf682378aac38d047b999d8a1731f7569d..41dd8c9e0382b4109a32ad55f68ba391
      // Paper start
      implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+
      implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21
-@@ -103,14 +103,14 @@ tasks.jar {
+@@ -118,14 +118,14 @@ tasks.jar {
          val gitBranch = git("rev-parse", "--abbrev-ref", "HEAD").getText().trim() // Paper
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
@@ -37,7 +37,7 @@ index c673a2cf682378aac38d047b999d8a1731f7569d..41dd8c9e0382b4109a32ad55f68ba391
              "Build-Number" to (build ?: ""),
              "Build-Time" to Instant.now().toString(),
              "Git-Branch" to gitBranch, // Paper
-@@ -255,3 +255,12 @@ tasks.registerRunTask("runReobfPaperclip") {
+@@ -270,3 +270,12 @@ tasks.registerRunTask("runReobfPaperclip") {
      classpath(rootProject.tasks.named<io.papermc.paperweight.tasks.CreatePaperclipJar>("createReobfPaperclipJar").flatMap { it.outputZip })
      mainClass.set(null as String?)
  }
@@ -173,18 +173,18 @@ index 90b3526479320064378f2cde6c2f2b8e48a59ba6..43ff8842f697106d8d1ea4e58097243b
                  .completer(new ConsoleCommandCompleter(this.server))
                  .option(LineReader.Option.COMPLETE_IN_WORD, true);
 diff --git a/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java b/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
-index a6e5950b5875cafd734300cdfbf58f5d3736f3c8..7256e02150a2ddc2afd821299d36b1c71b7930b6 100644
+index 3099c21ee589acf6edff5903a23673adf489024f..70c407cc8c6fb28ba6fcde1b8d5a66154ed71223 100644
 --- a/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
 +++ b/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
-@@ -32,6 +32,7 @@ public record ServerBuildInfoImpl(
+@@ -33,6 +33,7 @@ public record ServerBuildInfoImpl(
- 
      private static final String BRAND_PAPER_NAME = "Paper";
+     private static final String BRAND_PUFFERFISH_NAME = "Pufferfish"; // Purpur
      private static final String BRAND_PURPUR_NAME = "Purpur"; // Purpur
 +    private static final String BRAND_DIVINEMC_NAME = "DivineMC"; // DivineMC
  
      private static final String BUILD_DEV = "DEV";
  
-@@ -43,9 +44,9 @@ public record ServerBuildInfoImpl(
+@@ -44,9 +45,9 @@ public record ServerBuildInfoImpl(
          this(
              getManifestAttribute(manifest, ATTRIBUTE_BRAND_ID)
                  .map(Key::key)
@@ -241,10 +241,10 @@ index 8f74c2ec5252b6265549589310d742337c91cb2c..1f4c965531393dd81246de487bc86f6d
                      servergui.runFinalizers();
                  }
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-index 0dde7cd71a32e6c0cde6cbbaef585896a3d7dae7..490c4cf1067fe0f68a681511e60264134063d876 100644
+index cf0f3a14584b9280211f88808cb1ddfb10105ec5..dd3083f0f1efb9074e5eb8ebec69f77b59a91613 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-@@ -274,7 +274,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
+@@ -289,7 +289,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
  
      // Paper start
      private static void printOversizedLog(String msg, Path file, int x, int z) {
@@ -254,7 +254,7 @@ index 0dde7cd71a32e6c0cde6cbbaef585896a3d7dae7..490c4cf1067fe0f68a681511e6026413
  
      private static CompoundTag readOversizedChunk(RegionFile regionfile, ChunkPos chunkCoordinate) throws IOException {
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index c914e1e13c4f64f24efa5f825e58efb69632bfa6..137b1358ae73d93595eb4d702f44fc3ca3c0d54c 100644
+index 5e7b833fc9f37bc370c76e5c43e6c9919d6d20af..0b61d177a2a8c7286aac9d666a6d1c0f2c586849 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -491,7 +491,7 @@ public class CraftScheduler implements BukkitScheduler {

patches/server/0002-Divine-Configuration.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Divine Configuration
 
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index e9ad8e2ac267c46df80e884308df8bb12d0deeff..1f5f592fee897afaad76d779c224aa297c436814 100644
+index 7a442fb4cf78bcb1268359ee41a6de138edb76b6..924a1b7f444ab78512bb7773faf513a2a48fb485 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -57,6 +57,7 @@ import net.minecraft.world.level.GameType;
@@ -16,9 +16,9 @@ index e9ad8e2ac267c46df80e884308df8bb12d0deeff..1f5f592fee897afaad76d779c224aa29
  
  // CraftBukkit start
  import net.minecraft.server.WorldLoader;
-@@ -247,6 +248,16 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -250,6 +251,16 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-         com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Paper - start metrics
+         gg.pufferfish.pufferfish.PufferfishConfig.load(); // Pufferfish
-         com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now
+         gg.pufferfish.pufferfish.PufferfishCommand.init(); // Pufferfish
  
 +        // DivineMC start
 +        try {
@@ -34,7 +34,7 @@ index e9ad8e2ac267c46df80e884308df8bb12d0deeff..1f5f592fee897afaad76d779c224aa29
          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 eb52b1eea31a390c5f17a6c6b6e8bc6217d50189..7f09bcb70b8840acce057ef6eef90dfb41d46e70 100644
+index 34e8eb828be517d9ee3973597c74c5cac3d75c99..833983670727fc2844386ea2381358433f646c50 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -85,6 +85,7 @@ import net.minecraft.world.phys.AABB;
@@ -113,11 +113,11 @@ index 81922bf93f8a96e6cf05944ca98a82cc5945a6c6..825066dbd54ef753cdc03cbbe9deb654
          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 5bce26e9671aab15ac4bac9a0d00b5184bef74ea..55a522209ff34f166295fe6b7c218cebecf5e940 100644
+index 430407b0cf06ba337c59cd576c7e40a8e5fe8229..67723070296f861c477ab484ad7f39db9eba3074 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -184,6 +184,14 @@ public class Main {
+@@ -190,6 +190,14 @@ public class Main {
-                     .describedAs("Yml file");
+                         .describedAs("Yml file");
                  // Purpur end
  
 +                // DivineMC start

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 9221ce36355eaf8d4456209c57b68486d587c255..cdb4446924e49cab82f44c3f034632fe4486c837 100644
+index 17e23ca4dd2bbfba49ea00aa2b719a95feb931be..25f8ae4a6cc48cfb1901a0807cde95dced515733 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-@@ -338,9 +338,9 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -336,9 +336,9 @@ public class GlobalConfiguration extends ConfigurationPart {
          public boolean fixEntityPositionDesync = true;
          public boolean loadPermissionsYmlBeforePlugins = true;
          @Constraints.Min(4)
@@ -190,10 +190,10 @@ index 82210667376fd466d5d4cdcb56b62f6165bd5cde..0fef474e1bd0298c212b98369042917e
          public boolean disableEndCredits = false;
          public DoubleOr.Default maxLeashDistance = DoubleOr.Default.USE_DEFAULT;
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 1f5f592fee897afaad76d779c224aa297c436814..8ce566deb3c3267a2281943581ab213f1dea4e9b 100644
+index 924a1b7f444ab78512bb7773faf513a2a48fb485..467e88ba7ed3eb755c38d8038ae4231d1d4761b6 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -340,7 +340,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -343,7 +343,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
          String proxyFlavor = (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) ? "Velocity" : "BungeeCord";
          String proxyLink = (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) ? "https://docs.papermc.io/velocity/security" : "http://www.spigotmc.org/wiki/firewall-guide/";
          // Paper end - Add Velocity IP Forwarding Support

patches/server/0008-Fix-MC-172801.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Fix MC-172801
 Original post on Mojira: https://bugs.mojang.com/browse/MC-172801
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 734644edf9109ce0d0b059296d229f4877499c26..c18da64bb878a6fb1b1b9f9c1e9c3a2cc4c96e40 100644
+index f4604e543a980d6aeb485252da5a4e755aa12bfa..dfb2c5812e3d2a2fa58e80240952c07b427c6abd 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3312,7 +3312,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3339,7 +3339,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
      }
  
      protected float getFlyingSpeed() {

patches/server/0009-Fix-MC-2025.patch

@@ -7,10 +7,10 @@ Original post on Mojira: https://bugs.mojang.com/browse/MC-2025
 Fix taken from Reddit: https://redd.it/8pgd4q
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index febd5e137290952d820a7869eaaef77e374a3b07..2310da6000ecdffface1daaec8b5e1456d95c644 100644
+index aa171a1afb9800e6ec84f6b4f1b28e44177752f7..306fd7d38d359715637aa52f1ba261f5a1d94e07 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2763,6 +2763,17 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -2722,6 +2722,17 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                  nbttagcompound.putBoolean("Purpur.FireImmune", immuneToFire);
              }
              // Purpur end
@@ -28,7 +28,7 @@ index febd5e137290952d820a7869eaaef77e374a3b07..2310da6000ecdffface1daaec8b5e145
              return nbttagcompound;
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT");
-@@ -2841,6 +2852,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -2800,6 +2811,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                          this.reapplyPosition();
                      }
  

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

@@ -7,10 +7,10 @@ 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 2310da6000ecdffface1daaec8b5e1456d95c644..afe03c1ad85bd410860c9bd8a35ca769c6068820 100644
+index 306fd7d38d359715637aa52f1ba261f5a1d94e07..6e9f3208b9246dc2dec30fb0ec70d0bf2955a0be 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -326,6 +326,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -282,6 +282,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      public float yRotO;
      public float xRotO;
      private AABB bb;
@@ -18,7 +18,7 @@ index 2310da6000ecdffface1daaec8b5e1456d95c644..afe03c1ad85bd410860c9bd8a35ca769
      public boolean onGround;
      public boolean horizontalCollision;
      public boolean verticalCollision;
-@@ -1230,6 +1231,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -1189,6 +1190,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      // Paper end - detailed watchdog information
  
      public void move(MoverType type, Vec3 movement) {
@@ -31,7 +31,7 @@ index 2310da6000ecdffface1daaec8b5e1456d95c644..afe03c1ad85bd410860c9bd8a35ca769
          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");
-@@ -4509,6 +4516,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4468,6 +4475,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      }
  
      public final void setBoundingBox(AABB boundingBox) {

patches/server/0017-lithium-entity.fast_elytra_check-entity.fast_hand_sw.patch

@@ -7,10 +7,10 @@ Original code by CaffeineMC, licensed under LGPL v3
 You can find the original code on https://github.com/CaffeineMC/lithium-fabric (Yarn mappings)
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index c18da64bb878a6fb1b1b9f9c1e9c3a2cc4c96e40..b133bfd8fb75e3f8242f25cd66da46a0d2479bc0 100644
+index dfb2c5812e3d2a2fa58e80240952c07b427c6abd..989b73037159fa0b2b8431c4092f069a949b2971 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -2794,6 +2794,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2821,6 +2821,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
      }
  
      protected void updateSwingTime() {

patches/server/0024-Fix-sprint-glitch.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix sprint glitch
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index f9f553152a4af3fcc1b04c1278e0b35b85916a0c..014d4daf0bb4059ad304e309daf20e4abbcd2c0d 100644
+index 989b73037159fa0b2b8431c4092f069a949b2971..ec5086c9781a834580d16359c9d6005d2a17d1b0 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1461,7 +1461,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1474,7 +1474,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
                  player.setRealHealth(health);
              }
  

patches/server/0027-Reduce-sensor-work.patch

@@ -7,10 +7,10 @@ Original project: Bloom-host/Petal
 Link: https://github.com/Bloom-host/Petal
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 014d4daf0bb4059ad304e309daf20e4abbcd2c0d..8c4e685c4758c24aa8ad6b08e823729815654029 100644
+index ec5086c9781a834580d16359c9d6005d2a17d1b0..745e1af05b7577c5462d71cc66bf13f205ba9a4d 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1066,20 +1066,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1079,20 +1079,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
          }
  
          if (entity != null) {

patches/server/0031-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 50bc64000f24aa2ae0df2ce7fc77f27d760b8764..9aabf8d4a333f96f1431da12cd42766a6d1676bd 100644
+index 9ae16e24013ea5664d4ea6d52ed7dd188404890f..59d26f63fd6b6df86ae357be3fd530c1b9eb4394 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2454,6 +2454,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2455,6 +2455,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
      }
  
      private void tryHandleChat(String s, Runnable runnable, boolean sync) { // CraftBukkit
@@ -16,7 +16,7 @@ index 50bc64000f24aa2ae0df2ce7fc77f27d760b8764..9aabf8d4a333f96f1431da12cd42766a
          if (ServerGamePacketListenerImpl.isChatMessageIllegal(s)) {
              this.disconnectAsync((Component) Component.translatable("multiplayer.disconnect.illegal_characters"), org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_CHARACTERS); // Paper // Paper - add proper async disconnect
          } else if (this.player.isRemoved() || this.player.getChatVisibility() == ChatVisiblity.HIDDEN) { // CraftBukkit - dead men tell no tales
-@@ -2485,6 +2486,15 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2486,6 +2487,15 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          }
      }
  
@@ -33,7 +33,7 @@ index 50bc64000f24aa2ae0df2ce7fc77f27d760b8764..9aabf8d4a333f96f1431da12cd42766a
          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 49f69a42dbf35ac812b5bd53f395c3de8b332c19..ed1f3ce5af2834da3b8ed60b2445f603536a03a6 100644
+index 63065a22ff359c142bab23fccacfd5ebd86f81a5..ab257415665d80a1fc7d877831fc74ad50a6790a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -758,6 +758,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

patches/server/0033-Suppress-errors-from-dirty-attributes.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Suppress errors from dirty attributes
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index d8717af85f539da807ddf866e17f1e643c83d3f6..50c70173a3e896c0489dcb5f4c8d81b274d4726b 100644
+index c14ce846afb7364e541bfe01b73a06a94e48f55b..ed59639d7c92dc6e2e8ecf93738c0cabd71972ca 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
-@@ -453,7 +453,10 @@ public class ServerEntity {
+@@ -455,7 +455,10 @@ public class ServerEntity {
          }
  
          if (this.entity instanceof LivingEntity) {
@@ -20,7 +20,7 @@ index d8717af85f539da807ddf866e17f1e643c83d3f6..50c70173a3e896c0489dcb5f4c8d81b2
  
              if (!set.isEmpty()) {
                  // CraftBukkit start - Send scaled max health
-@@ -464,7 +467,7 @@ public class ServerEntity {
+@@ -466,7 +469,7 @@ public class ServerEntity {
                  this.broadcastAndSend(new ClientboundUpdateAttributesPacket(this.entity.getId(), set));
              }
  

patches/server/0039-Petal-Reduce-work-done-by-game-event-system.patch

@@ -34,7 +34,7 @@ index 4729befa12732a9fd65cce243b33b3b479026c41..4f63d2d9e37be27724eddea2c61f681c
              LivingEntity entityliving1 = deadEntity.getLastHurtByMob();
  
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 4640baec5bed6c2d53cc0f8ca1d273cc115abe9b..2194c96ad5d54e082cfbe165f086b8fa29a1ad52 100644
+index 5c4843f6cfd13790a44fc0f928f1fbcef8a648ce..bc5d3d1fd50ed1d888bdfa7e086995be566104d7 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -83,7 +83,18 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
@@ -57,7 +57,7 @@ index 4640baec5bed6c2d53cc0f8ca1d273cc115abe9b..2194c96ad5d54e082cfbe165f086b8fa
      private final LevelChunkTicks<Block> blockTicks;
      private final LevelChunkTicks<Fluid> fluidTicks;
      private LevelChunk.UnsavedListener unsavedListener;
-@@ -98,7 +109,7 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
+@@ -110,7 +121,7 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
          this.unsavedListener = (chunkcoordintpair1) -> {
          };
          this.level = (ServerLevel) world; // CraftBukkit - type
@@ -66,7 +66,7 @@ index 4640baec5bed6c2d53cc0f8ca1d273cc115abe9b..2194c96ad5d54e082cfbe165f086b8fa
          Heightmap.Types[] aheightmap_type = Heightmap.Types.values();
          int j = aheightmap_type.length;
  
-@@ -254,9 +265,23 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
+@@ -268,9 +279,23 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
          Level world = this.level;
  
          if (world instanceof ServerLevel worldserver) {
@@ -93,7 +93,7 @@ index 4640baec5bed6c2d53cc0f8ca1d273cc115abe9b..2194c96ad5d54e082cfbe165f086b8fa
          } else {
              return super.getListenerRegistry(ySectionCoord);
          }
-@@ -652,7 +677,7 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
+@@ -666,7 +691,7 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
      }
  
      private void removeGameEventListenerRegistry(int ySectionCoord) {

patches/server/0041-No-chat-sign.patch

@@ -105,10 +105,10 @@ index 5705cb920084b775cce4b361683b32c6b6e003ed..9c031dd0fa279a23405e5b7d77e4c11e
      }
  }
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 8ce566deb3c3267a2281943581ab213f1dea4e9b..56cddedd09e54b07abb93a71a7d4d414f1600826 100644
+index 467e88ba7ed3eb755c38d8038ae4231d1d4761b6..13a226c1e110bf51962f891ca52a92e2f309946d 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -692,7 +692,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -696,7 +696,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
          // Paper start - Add setting for proxy online mode status
          return dedicatedserverproperties.enforceSecureProfile
              && io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode()
@@ -147,7 +147,7 @@ index 7d276c191b391bca24948ddb36b8b7d0f1f03b03..c1d3a811ca17f303b6a35a4c044cacf1
          if (packet == null || this.processedDisconnect) { // Spigot
              return;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index d823c9dc6d898f55e677dc320c84a4d8696671b1..f7513c3b6b7232ddcb7f9094cd31e4d28e6f294a 100644
+index 16999fa20c3621e016d1b0fadfb76f2fe03a2a69..05b056f803d2c96fb6bf0f00baa03d2e0c4d4511 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1426,7 +1426,7 @@ public abstract class PlayerList {

patches/server/0047-Option-to-disable-moved-wrongly-threshold.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Option to disable moved wrongly threshold
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 9aabf8d4a333f96f1431da12cd42766a6d1676bd..d6f414bb93e9ca939fd7278cf4eaabf6fffaec2e 100644
+index 59d26f63fd6b6df86ae357be3fd530c1b9eb4394..18758042dd5fb4720d43f5e766af15519395d533 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -590,7 +590,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -28,7 +28,7 @@ index 9aabf8d4a333f96f1431da12cd42766a6d1676bd..d6f414bb93e9ca939fd7278cf4eaabf6
                      ServerGamePacketListenerImpl.LOGGER.warn("{} (vehicle of {}) moved wrongly! {}", new Object[]{entity.getName().getString(), this.player.getName().getString(), Math.sqrt(d10)});
                  }
  
-@@ -1482,7 +1482,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1483,7 +1483,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                                          io.papermc.paper.event.player.PlayerFailMoveEvent event = fireFailMove(io.papermc.paper.event.player.PlayerFailMoveEvent.FailReason.MOVED_TOO_QUICKLY,
                                              toX, toY, toZ, toYaw, toPitch, true);
                                          if (!event.isAllowed()) {
@@ -37,7 +37,7 @@ index 9aabf8d4a333f96f1431da12cd42766a6d1676bd..d6f414bb93e9ca939fd7278cf4eaabf6
                                                  ServerGamePacketListenerImpl.LOGGER.warn("{} moved too quickly! {},{},{}", new Object[]{this.player.getName().getString(), d6, d7, d8});
                                              this.teleport(this.player.getX(), this.player.getY(), this.player.getZ(), this.player.getYRot(), this.player.getXRot());
                                              return;
-@@ -1552,7 +1552,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1553,7 +1553,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                              d10 = d6 * d6 + d7 * d7 + d8 * d8;
                              boolean movedWrongly = false; // Paper - Add fail move event; rename
  

patches/server/0048-Implement-Secure-Seed.patch

@@ -52,10 +52,10 @@ index 05e16103af3fd276f0196ddf1a2e5b729b025c34..e0118dfee89d4319f70a0d2f84ba4c21
              return GsonHelper.parse(!s1.isEmpty() ? s1 : "{}");
          }, new JsonObject()), (String) this.get("level-type", (s1) -> {
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 61a73a234d9bdd22958ae261b7d0359179f7a57b..d0f5db80dde032d325e05bade329418113545031 100644
+index 1cb8c9d21eef27492efc4995525c198cbffd4b9b..923fff42046ff5fde7b9a7be3ed19c7f7fa024ce 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-@@ -641,6 +641,7 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
+@@ -685,6 +685,7 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
      }
  
      public ChunkGenerator getGenerator() {
@@ -64,7 +64,7 @@ index 61a73a234d9bdd22958ae261b7d0359179f7a57b..d0f5db80dde032d325e05bade3294181
      }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index f1ccf5ecbb6d6b86bec05ce722cd7c82174bb28a..a840b8fa8851125c1fe078eb00c7e8a02524589f 100644
+index 6a359f1ed07aa7b9c78e470fb00661ea03eaec03..1d824fbf42cca489488ce92ca61ea348aed34787 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -643,6 +643,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
@@ -435,7 +435,7 @@ index a59fdf91cb2f17aa2855af0a63a1396ed6179185..3f2ccf2c21411d2a8df39b034b9898a0
          Rotation rotation = Rotation.getRandom(worldgenRandom);
          StructureTemplatePool structureTemplatePool = structurePool.unwrapKey()
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-index 0074bc0e7147dc3a8c538e796f14ac9bf8725896..2f9e110fc8067dff39eb0222a1fb47b9706122e4 100644
+index 2dd38f40c8c0b48b12ffe557ceeed69213066a6a..11cad88fc387f64df0f4e13558611c4d69487266 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 @@ -205,7 +205,12 @@ public class CraftChunk implements Chunk {