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

Updated Upstream (Paper) (#787)

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

Paper Changes:
PaperMC/Paper@c1bd3cc Updated Upstream (CraftBukkit) (#7105)
PaperMC/Paper@df1301b Make org.bukkit.Keyed extend Adventure's Keyed (#7090)
PaperMC/Paper@d8747c1 [ci skip] Add nullable annotation to field (#7042)
PaperMC/Paper@7f31095 Add more Campfire API (#5779)
PaperMC/Paper@51d1687 Update log4j to 2.16.0
This commit is contained in:
Oharass
2021-12-14 13:59:40 -06:00
committed by GitHub
parent 45ae426761
commit b8261d92e6
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,10 +17,10 @@ index f944e6beafc7876ed9c6923a22f58d82967b77cb..e1c7b7a659e56fa5b3a1f52cb2ccc99b
public final boolean spawnNpcs = this.get("spawn-npcs", true);
public final boolean pvp = this.get("pvp", true);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 549577e31840ce5f32adb2c0909b915da4362207..196f586380bd458c3f2c47a84dc7e2a36afb94aa 100644
index 5566c149b6c44a13ea65ab8ccb61055afbb2e277..da5651f61be49bcceb9b912f155b24c511a9a5ca 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2817,4 +2817,11 @@ public final class CraftServer implements Server {
@@ -2810,4 +2810,11 @@ public final class CraftServer implements Server {
}
// Paper end