Updated Upstream (Purpur)

Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@3ef9911 save https://github.com/PaperMC/Paper/pull/9149 from paper pr queue hell
PurpurMC/Purpur@a54b535 Updated Upstream (Paper)

.github/workflows/build.yml

@@ -15,7 +15,7 @@ jobs:
   release:
     strategy:
       matrix:
-        base_jdk: [19]
+        base_jdk: [17]
         graal: [latest]
         os: [ubuntu-22.04]
 

.upstream-data

@@ -1,2 +1,2 @@
-purpurCommit = 68322ba77d2f570f0d5965b652d870fb2519f896
-pufferfishCommit = 5816939ca482518e3ddef6afa60ed287bc912b34
+purpurCommit = a54b535677e590ff38be16bd668b3ac3af52e373
+pufferfishCommit = 1a55e9140b2477a081b394bd27d56d691b90fc2c

build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
     java
     `maven-publish`
     id("com.github.johnrengelman.shadow") version "8.1.1" apply false
-    id("io.papermc.paperweight.patcher") version "1.5.4"
+    id("io.papermc.paperweight.patcher") version "1.5.5"
 }
 
 repositories {

gradle.properties

@@ -1,7 +1,7 @@
 group = org.plazmamc.plazma
 version = 1.19.4-R0.1-SNAPSHOT
 
-paperCommit = 936205beae24652acf56c6e765072bc6a0156ed3
+paperCommit = bcec5b11e6728f3eb3078aa4fcc8e87f3d545ec2
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/api/0001-Pufferfish-API-Changes.patch

@@ -1,10 +1,10 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <dev@alpha93.kr>
-Date: Fri, 14 Apr 2023 07:48:58 +0000
+Date: Fri, 28 Apr 2023 06:55:29 +0000
 Subject: [PATCH] Pufferfish API Changes
 
-Pufferfish
-Copyright (C) 2022 Pufferfish Studios LLC
+Original: Kevin Raneri <kevin.raneri@gmail.com>
+Copyright (C) 2023 Pufferfish Studios LLC
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

patches/api/0002-Purpur-API-Changes.patch

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <dev@alpha93.kr>
-Date: Fri, 14 Apr 2023 07:48:58 +0000
+Date: Fri, 28 Apr 2023 07:03:41 +0000
 Subject: [PATCH] Purpur API Changes
 
 Original: PurpurMC

patches/server/0001-Pufferfish-Server-Changes.patch

@@ -1,10 +1,10 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <dev@alpha93.kr>
-Date: Fri, 14 Apr 2023 07:48:58 +0000
+Date: Fri, 28 Apr 2023 06:55:29 +0000
 Subject: [PATCH] Pufferfish Server Changes
 
-Pufferfish
-Copyright (C) 2022 Pufferfish Studios LLC
+Original: Kevin Raneri <kevin.raneri@gmail.com>
+Copyright (C) 2023 Pufferfish Studios LLC
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

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

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <dev@alpha93.kr>
-Date: Fri, 14 Apr 2023 07:50:36 +0000
+Date: Fri, 28 Apr 2023 07:03:40 +0000
 Subject: [PATCH] Purpur Server Changes
 
 Original: PurpurMC
@@ -288,10 +288,22 @@ index 6e441a1a28ba72a8b1cc09fe5fca71b3c70627d4..47e77541e558e18758ae0fcc2aa4e472
  				"This can improve performance by a few percent, but has minor gameplay implications.");
  	}
 diff --git a/src/main/java/io/papermc/paper/chunk/system/scheduling/ChunkHolderManager.java b/src/main/java/io/papermc/paper/chunk/system/scheduling/ChunkHolderManager.java
-index e5d9c6f2cbe11c2ded6d8ad111fa6a8b2086dfba..830d863cd9665d58875bfa5ca2bcd22f89ab2d49 100644
+index e5d9c6f2cbe11c2ded6d8ad111fa6a8b2086dfba..51018f8b7176c72231fc0d0c23878659ab5c1b5b 100644
 --- a/src/main/java/io/papermc/paper/chunk/system/scheduling/ChunkHolderManager.java
 +++ b/src/main/java/io/papermc/paper/chunk/system/scheduling/ChunkHolderManager.java
-@@ -915,9 +915,9 @@ public final class ChunkHolderManager {
+@@ -257,6 +257,11 @@ public final class ChunkHolderManager {
+         }
+         if (flush) {
+             RegionFileIOThread.flush();
++            try {
++                this.world.chunkSource.chunkMap.regionFileCache.flush();
++            } catch (IOException ex) {
++                LOGGER.error("Exception when flushing regions in world {}", this.world.getWorld().getName(), ex);
++            }
+         }
+         if (logProgress) {
+             LOGGER.info("Saved " + savedChunk + " block chunks, " + savedEntity + " entity chunks, " + savedPoi + " poi chunks in world '" + this.world.getWorld().getName() + "' in " + format.format(1.0E-9 * (System.nanoTime() - start)) + "s");
+@@ -915,9 +920,9 @@ public final class ChunkHolderManager {
      }
  
      public boolean processTicketUpdates() {
@@ -909,10 +921,10 @@ index d1127d93a85a837933d0d73c24cacac4adc3a5b9..d9a6d273108165f59b995b1fd7748cb5
                      return true;
                  }
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index fa1d325034dafdb9f1da546a6f9c5e88d2b67749..c5d030379a25e17befafd566e5ec61592bba7eba 100644
+index f9e10bf048929886db3c414038d2c7e9f84226a6..323416311f14f5ad887f05183ad3b4921981aecd 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
-@@ -569,11 +569,20 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -572,11 +572,20 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
      private static final int MAX_PER_TICK = io.papermc.paper.configuration.GlobalConfiguration.get().misc.maxJoinsPerTick; // Paper
      private static int joinAttemptsThisTick; // Paper
      private static int currTick; // Paper