Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 01:17:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper & Pufferfish)

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/api/0011-Bring-back-server-name.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Bring back server name
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index fc16e897f4ebaf9d79e49774e15a1cded33ef725..4e4d4931ec8d097f8b6162d56c9ec2eed8a982b4 100644
index 3506a7fa07ee6e53704b1df8d8d2bb08704bfc37..320e4697236b743ffe4e32c0e73b82c3e6896683 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2381,4 +2381,15 @@ public final class Bukkit {
@@ -2412,4 +2412,15 @@ public final class Bukkit {
public static Server.Spigot spigot() {
return server.spigot();
}
@@ -25,10 +25,10 @@ index fc16e897f4ebaf9d79e49774e15a1cded33ef725..4e4d4931ec8d097f8b6162d56c9ec2ee
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 1895962c5ad0e9549cc90b0fa2861b7874d3e5aa..ca6ea0b03fb06f91712c68f7c84d8025908d65bf 100644
index 1895ac9cd331f9c2b76203a3e1d9bbf0d40ce4f1..3bb33271ecb6021e34db92127964579eaf5c54ff 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2077,4 +2077,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2102,4 +2102,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@NotNull org.bukkit.potion.PotionBrewer getPotionBrewer();
// Paper end