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)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@a9f252e Replace third party repos with Paper repo (#7733)
PaperMC/Paper@b8fa41e [ci skip] Remove Mojang repo from test-plugin
PaperMC/Paper@c6e631a Use username instead of display name in PlayerList#getPlayerStats (#7740)
PaperMC/Paper@1cfd363 Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
granny
2022-04-16 05:03:34 -07:00
parent daeb232e18
commit d4c11601c7
45 changed files with 186 additions and 186 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 c093ba024cfd951be1afc4100d899ed8f70ab003..83bd664304e972c04fb21ebad857feec7062485d 100644
index dcfd22862c79ae01ca7707d9abf0a71cc0d4ad9d..02eda647b3edce330251c97483d861a080238e37 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2322,4 +2322,15 @@ public final class Bukkit {
@@ -2334,4 +2334,15 @@ public final class Bukkit {
public static Server.Spigot spigot() {
return server.spigot();
}
@@ -25,10 +25,10 @@ index c093ba024cfd951be1afc4100d899ed8f70ab003..83bd664304e972c04fb21ebad857feec
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index c0b2d372ea5f86779d1f0eda79e87a2ce08af2bb..843b5c66f38864c5bb27229133e56d71b83dd91e 100644
index 187d610fbd9707256d0af2f343bee95829e4efc6..ef034c77723ffff8eb70326d4952f8f169cb1932 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2025,4 +2025,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2038,4 +2038,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@NotNull org.bukkit.potion.PotionBrewer getPotionBrewer();
// Paper end