Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +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@7045f18 Change link to screamingsandals
PaperMC/Paper@ca62386 Hide ores with deepslate at Y=4 and below (#7792)
PaperMC/Paper@9b492cf Deprecate set/doesBounce from Projectile (#7800)
PaperMC/Paper@ed4e916 [ci-skip] Update repository and API urls (#7835)
PaperMC/Paper@fc1752f Fix more upstream javadocs (#7837)

Pufferfish Changes:
pufferfish-gg/Pufferfish@629b5b3 Updated Upstream (Paper)
This commit is contained in:
granny
2022-05-21 03:26:59 -07:00
parent 0939ddedab
commit 5f07aff44c
7 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,10 +25,10 @@ index d8666481f9a407403d0114ff02024fd3c50c27c4..a1374b608c20d47fde15135089bf8ace
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 541da7064f5bd563cde8475be6bc47c82d9cd22b..027e0141995ce8edc11ae0ab3c589ad6ac00b43c 100644
index 30a1ba5ec7752a1771046072d00ed1718e6d0b84..0eb5c94458e7a87e6cf9d6332a0889286f96826e 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2070,4 +2070,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2067,4 +2067,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@NotNull org.bukkit.potion.PotionBrewer getPotionBrewer();
// Paper end