Updated Upstream (Paper & Pufferfish)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@9797f08 Sync Starlight SaveUtil with 1.1.1
PaperMC/Paper@ed9cf5c Fix missing null check in ChunkGenerator#findNearestMapStructure
PaperMC/Paper@fb2c24b Updated Upstream (Bukkit/CraftBukkit) (#8015)

Pufferfish Changes:
pufferfish-gg/Pufferfish@892ec46 Fix minecart loading bug. PurpurMC/Purpur#1008
pufferfish-gg/Pufferfish@8780a38 Updated Upstream (Paper)
This commit is contained in:
BillyGalbreath
2022-06-20 23:09:28 -05:00
parent def1bd407d
commit 4f47e9c368
19 changed files with 72 additions and 71 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Purpur config files
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 30b49aed62fa67276e8964922ea3f84458d854bb..1895962c5ad0e9549cc90b0fa2861b7874d3e5aa 100644
index e756edf56995f4552387c2e1082307eb3dd48bb3..1895ac9cd331f9c2b76203a3e1d9bbf0d40ce4f1 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1897,6 +1897,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1922,6 +1922,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
}
// Paper end