Merge branch 'ver/1.19.2' of https://github.com/PrismarineTeam/Prisma…

…rine into dev/rewrite-chunk-system

gradle.properties

@@ -1,7 +1,7 @@
 group = net.prismarineteam.prismarine
 version = 1.19.2-R0.1-SNAPSHOT
 
-paperCommit = 9592da1f84db1565bc67072504a30f488cf782e0
+paperCommit = 4ba43fe02a01abbbccac73f6ff992b6c667accb0
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/server/0005-Purpur-Server-Changes.patch

@@ -20549,7 +20549,7 @@ index 138407c2d4b0bc55ddb9aac5d2aa3edadda090fb..a6e9e503a496c18e2501b03ec84f4600
          // Paper end - add timings for scoreboard search
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 522c519752d2fdb838bd797c77fdc7d0934b51e9..03382a35e5b22b871ba945687c4030c5cf091625 100644
+index 05cc8f9cdcd7e920bf9503f68efb16cd74a359a2..0b248a987d22da21aa802c5dba00b4f987c365ea 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -430,7 +430,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -25668,7 +25668,7 @@ index 0000000000000000000000000000000000000000..d333334f323049ca97e756324cff0b23
 +}
 diff --git a/src/main/java/org/purpurmc/purpur/task/CompassTask.java b/src/main/java/org/purpurmc/purpur/task/CompassTask.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..bdb214bc2e0d944a26c825c1124d23d4fee2eca9
+index 0000000000000000000000000000000000000000..5c06909e343f06b00816fcf227c7080aec8057ce
 --- /dev/null
 +++ b/src/main/java/org/purpurmc/purpur/task/CompassTask.java
 @@ -0,0 +1,68 @@
@@ -25700,7 +25700,7 @@ index 0000000000000000000000000000000000000000..bdb214bc2e0d944a26c825c1124d23d4
 +        }
 +        tick = 0;
 +
-+        MinecraftServer.getServer().levels.forEach((key, level) -> {
++        MinecraftServer.getServer().getAllLevels().forEach((level) -> {
 +            if (level.purpurConfig.compassItemShowsBossBar) {
 +                level.players.forEach(player -> {
 +                    if (!player.compassBar()) {

patches/server/0006-Fix-Purpur-patches.patch

@@ -30,15 +30,6 @@ diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/
 index 5a609ddfdad131172de374e3006aaf4b5aadc5ed..3acde23569719eee5493738b6e64e9eb1b545313 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -221,7 +221,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-     private String localIp;
-     private int port;
-     public final RegistryAccess.Frozen registryHolder;
--    private Map<ResourceKey<Level>, ServerLevel> levels;
-+    public Map<ResourceKey<Level>, ServerLevel> levels; // Prismarine - private -> public
-     private PlayerList playerList;
-     private volatile boolean running;
-     private volatile boolean isRestarting = false; // Paper - flag to signify we're attempting to restart
 @@ -942,7 +942,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
 
          MinecraftServer.LOGGER.info("Stopping server");

upstream-data

@@ -1,2 +1,2 @@
-purpur = 0fd6a5698f14e8bfb6574e76cb0da54e5fb55e76
+purpur = ac5c303a0dae61581ed23f217187b6b8b82d770c
 pufferfish = 254c00275d81d8b94956f1729c8bbdc8319244f3