Updated Upstream (Pufferfish)

Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by SapphireMC and as with ANY update, please do your own testing

Pufferfish Changes:
pufferfish-gg/Pufferfish@b0f4922 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@fd44f68 Update paperweight
pufferfish-gg/Pufferfish@cba8555 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@003a28a Updated Upstream (Paper)

gradle.properties

@@ -2,7 +2,7 @@ group=io.sapphiremc.sapphire
 version=1.20.2-R0.1-SNAPSHOT
 
 mcVersion=1.20.2
-pufferfishRef=0ba7617d7efe39b7e15d5b080e9df2a512144fb0
+pufferfishRef=003a28a5dc785ecb8347718dbc59e348d139d33b
 
 org.gradle.caching=true
 org.gradle.parallel=true

patches/api/0002-Sapphire-configuration.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Sapphire configuration
 
 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 8d8fe04e6b09d2a5b1cc05002073df5c58cdcb96..b5c9eddef4fc98a31089b0d7c1f7df463032fe73 100644
+index d0c634629aa0b6bac0da93655dd86ad3aea0ce30..2139deea292386904f5216ddec9de598d9840a82 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2121,6 +2121,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2190,6 +2190,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
          }
          // Paper end
 

patches/api/0003-Chromium-client-support.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Chromium client support
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 20fa1024f9ad8f478a347be5c554b5e45b398a1c..cc992cc5d2ac2ccd60f4876be8f20f45a2ea75ee 100644
+index 9240ea09206461d61cc08d4252e8507555bf41cf..66d477ba99c622ed5786dbe3b8f2880602cf1a79 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3278,4 +3278,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3307,4 +3307,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @Override
      Spigot spigot();
      // Spigot end

patches/server/0001-Rebrand.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 77f76653c22c44ac9ab7f396b686affc228502c9..316663e83d09f15024de586651c37064b5752a71 100644
+index b99daeab0d9a22dde4cd8d7395a5471f91ebc9f6..9278a32ff2f8bbbd5631421a6aee8c7d63d11583 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -13,9 +13,9 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
@@ -137,7 +137,7 @@ index c5d5648f4ca603ef2b1df723b58f9caf4dd3c722..1abd60741ece7982bdb6a2d90f81df36
                  .completer(new ConsoleCommandCompleter(this.server))
                  .option(LineReader.Option.COMPLETE_IN_WORD, true);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 371049c1236c6443384c0ce184e99d5b9f8e57c2..5a39cc6d975f39185d65b1849a42a7a002ae09ea 100644
+index 58d076e2a8fa1cf56c4c8d15a502e85fcf48aa90..3c3130359d0c2b4bd3fcb0a6516786708627999e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -910,7 +910,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -150,10 +150,10 @@ index 371049c1236c6443384c0ce184e99d5b9f8e57c2..5a39cc6d975f39185d65b1849a42a7a0
                  this.getRunningThread().stop();
                  try {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5a95dcc02241d6036ee520a6a7a05e8713c6081f..416b081892930d3e6302b2b00c067ffa5921fe52 100644
+index 697e74b4d966f7472f0cb3dcaca928cdde4714d7..a3b4d1876d0353e586c9a8f8b8a43578b26c2f37 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -267,7 +267,7 @@ import javax.annotation.Nullable; // Paper
+@@ -269,7 +269,7 @@ import javax.annotation.Nullable; // Paper
  import javax.annotation.Nonnull; // Paper
 
  public final class CraftServer implements Server {
@@ -163,7 +163,7 @@ index 5a95dcc02241d6036ee520a6a7a05e8713c6081f..416b081892930d3e6302b2b00c067ffa
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index e4cacb17f56c618bef19e1165c07aac86af61150..cdeece8fcbc00a31004c852d5dfd1c861e412d10 100644
+index 2af0068ef338634d1f44532af5db66c2d0b3dd10..caad939768c9d5094ba2160e783eb343442d15b2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -300,7 +300,7 @@ public class Main {
@@ -176,10 +176,10 @@ index e4cacb17f56c618bef19e1165c07aac86af61150..cdeece8fcbc00a31004c852d5dfd1c86
                          //Thread.sleep(TimeUnit.SECONDS.toMillis(20));
                          // Paper End
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 3298aac109e08da4801a6f08aa6f7acfc5e6bf16..4e81ddf6a970972e798e7ffac45d2bf6a9846b26 100644
+index 397c10f64db3a4d7296fe18585b56851bc3a1f01..497ad5fc2e8a31770d1af275ebb1da68ac0f45cf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -462,7 +462,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -485,7 +485,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
 
      @Override
      public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
@@ -202,7 +202,7 @@ index 80553face9c70c2a3d897681e7761df85b22d464..76278161386b648bcf12188df382cb83
 
          if (stream != null) {
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index 50c72e5db369a180f425eaaa0411cb8871bc3463..980cba15b0f7fc4afbd10efea3d703c8d00750ab 100644
+index 40dcdf6885e99b26283a9ea2bd4d4bf6ec358e71..3cb6cfaea998665c95401d18b3e3c57f984f1682 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -155,14 +155,14 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa

patches/server/0002-Sapphire-config-files.patch

@@ -216,7 +216,7 @@ index 0000000000000000000000000000000000000000..226a5e361f382585f4dcc5e901d2a1bd
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5a39cc6d975f39185d65b1849a42a7a002ae09ea..0c86b434dffb6d63bef011ee89f47c99757c04a0 100644
+index 3c3130359d0c2b4bd3fcb0a6516786708627999e..d7250dcc9efa68a8672a7e5fa844da544858d994 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1699,7 +1699,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -229,7 +229,7 @@ index 5a39cc6d975f39185d65b1849a42a7a002ae09ea..0c86b434dffb6d63bef011ee89f47c99
 
      public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 66aeb0ea388a8c8a08cf33728921061a0c74552f..ccddb1920c29b3218b7d32eb0c4a994bbcab76ea 100644
+index e5c955e7e99bc07199feabfe9f0301016ad38b84..df333d76cb1f58c1e0314b7941f28cd10eddc283 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -218,6 +218,14 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -248,7 +248,7 @@ index 66aeb0ea388a8c8a08cf33728921061a0c74552f..ccddb1920c29b3218b7d32eb0c4a994b
          io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider
          // Paper end
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 2cdc2bd62f0cb62f75365b6b3e6d80d9a2132451..9a899b6210594e7ad3e0cb00eba0222e89b13a4c 100644
+index d6d86597fbca937a32e74ecb913f569f9740e7d8..8e1def4701029de7eafd0649d8ec2ae721a8b0a1 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -413,6 +413,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -260,7 +260,7 @@ index 2cdc2bd62f0cb62f75365b6b3e6d80d9a2132451..9a899b6210594e7ad3e0cb00eba0222e
                      this.hurt(this.damageSources().inWall(), 1.0F);
                  } else if (flag && !this.level().getWorldBorder().isWithinBounds(this.getBoundingBox())) {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 1e2620338f0b6fd1c160a8f8d6b659e273f2f1c9..e7836daffc86429b7ba63a8ac0f5c57b2404d8bf 100644
+index 99e1c645871be28d130319b65700a1b8db093de4..b25e3c4321943ad9fa5a784087cf2dde27bf1e84 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -176,6 +176,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -280,26 +280,26 @@ index 1e2620338f0b6fd1c160a8f8d6b659e273f2f1c9..e7836daffc86429b7ba63a8ac0f5c57b
          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 416b081892930d3e6302b2b00c067ffa5921fe52..20de7d1f685ed74f3f9f81f394830918868a0adb 100644
+index a3b4d1876d0353e586c9a8f8b8a43578b26c2f37..fef2fdc9c2e853be39c17c63f1990c91bbea959b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1039,6 +1039,7 @@ public final class CraftServer implements Server {
+@@ -1041,6 +1041,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);
 +        io.sapphiremc.sapphire.SapphireConfig.init((File) console.options.valueOf("sapphire-settings")); // Sapphire
          for (ServerLevel world : this.console.getAllLevels()) {
              // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
              world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
-@@ -1054,6 +1055,7 @@ public final class CraftServer implements Server {
+@@ -1056,6 +1057,7 @@ public final class CraftServer implements Server {
                  }
              }
              world.spigotConfig.init(); // Spigot
 +            world.sapphireConfig.init(); // Sapphire
          }
 
          Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
-@@ -2919,6 +2921,13 @@ public final class CraftServer implements Server {
+@@ -2983,6 +2985,13 @@ public final class CraftServer implements Server {
              return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
          }
 
@@ -314,7 +314,7 @@ index 416b081892930d3e6302b2b00c067ffa5921fe52..20de7d1f685ed74f3f9f81f394830918
          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 cdeece8fcbc00a31004c852d5dfd1c861e412d10..3f43901ade5ba4f0d47ff6b9492eaccaf0b1a9a6 100644
+index caad939768c9d5094ba2160e783eb343442d15b2..fdd509a03381afc7e0708db708784b9b29197adb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -173,6 +173,14 @@ public class Main {

patches/server/0003-Per-entity-type-collision-settings.patch

@@ -172,10 +172,10 @@ index 81dbf4ae89d1959996c453c4e15abf046edc0bd9..38deac094eccb6eb6c2305a01f3760e9
 +    }
  }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 9a899b6210594e7ad3e0cb00eba0222e89b13a4c..7a9e034b80deb2c9d314f0e5d88783555e9f0a68 100644
+index 8e1def4701029de7eafd0649d8ec2ae721a8b0a1..dea64ea241f0a0e45b00d7a1d0625b5dbbbc4abf 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3577,7 +3577,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3574,7 +3574,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
                  return;
              }
              // Paper end - don't run getEntities if we're not going to use its result

patches/server/0008-Chromium-client-support.patch

@@ -70,7 +70,7 @@ index c337948c82263af20e55570a2c65288aa0123334..e59f4a767d04046404c266bafba4ccc4
 
          return aliases;
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index ba972d1661426d7e30f6f61bad3b9608e66ea721..e7ef3953dc8cc418f3e155f706f2ba851b5597a1 100644
+index f71a4a8307fb092d33545e12d253e0b80c884168..11f4bff9d4679035140f7460800b243f2f50500f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -274,6 +274,7 @@ public class ServerPlayer extends Player {
@@ -82,7 +82,7 @@ index ba972d1661426d7e30f6f61bad3b9608e66ea721..e7ef3953dc8cc418f3e155f706f2ba85
      // Paper start - replace player chunk loader
      private final java.util.concurrent.atomic.AtomicReference<io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances> viewDistances = new java.util.concurrent.atomic.AtomicReference<>(new io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances(-1, -1, -1));
 diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index 20122bf191ebc74c223310aea1f004fdbb163e57..e378e06b1d897f9a83d9f07c52ea5b2a7c394b14 100644
+index 598f807f0d0caac98b81e0e2991f1bd497c4534e..b5d96fba65b0a195c04f29587e8b46f780a96ed3 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 @@ -112,6 +112,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
@@ -108,10 +108,10 @@ index 20122bf191ebc74c223310aea1f004fdbb163e57..e378e06b1d897f9a83d9f07c52ea5b2a
              try {
                  byte[] data = new byte[payload.readableBytes()];
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 604ed1f6742a6b028b9db2809f7bd4b9a3b38f4d..b1201da0c81a632e247c6543cf533ad4d7998aeb 100644
+index 83aaf3e6e377d731ce02f779f80b7bf5db46f89f..aa8b663e35632c24fd04b6b2eeb14ef0d2f37898 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3283,4 +3283,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3287,4 +3287,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.spigot;
      }
      // Spigot end

patches/server/0009-Allow-force-spawns.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Allow force spawns
 Ported from EmpireCraft
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index c1b03e4c37ea85ddf283479682d0eb2eca57ee3c..0375ad7ba6d79c7965e98766ba5cc337c044b93c 100644
+index 945783d090e44ebed1d4968c1d1ec0b68f6d494f..3bbd01f0ae1f190584bc302ba9a184ce04463ac3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1630,7 +1630,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -19,10 +19,10 @@ index c1b03e4c37ea85ddf283479682d0eb2eca57ee3c..0375ad7ba6d79c7965e98766ba5cc337
 
      public void addDuringTeleport(Entity entity, CreatureSpawnEvent.SpawnReason reason) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 193ad79f57255b1ea4cf7930071b4f4988dc2b04..0dc72f3ef8e7cb42ab05a5327575726b990c73ae 100644
+index 5dc160b743534665c6b3efb10b10f7c36e2da5ab..62babfd61a2c8b50907ff456125d73c0b68819a1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -754,7 +754,7 @@ public class CraftEventFactory {
+@@ -756,7 +756,7 @@ public class CraftEventFactory {
              event = CraftEventFactory.callEntitySpawnEvent(entity);
          }