Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 18:07: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:
a55617d9ce Fix/improve the last upstream update (#6780)
72a3175165 Updated Upstream (Bukkit/CraftBukkit) (#6791)
eaee7a2473 Use correct LevelStem registry when loading default end/nether (#6789)
This commit is contained in:
William Blake Galbreath
2021-10-17 20:22:22 -05:00
parent db65efba2b
commit 2df73e0ed8
10 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0003-Rebrand.patch
View File

@@ -112,10 +112,10 @@ index e0b1f0671d16ddddcb6725acd25a1d1d69e42701..8c3c68465197fafc14849dc38a572e30
.completer(new ConsoleCommandCompleter(this.server))
.option(LineReader.Option.COMPLETE_IN_WORD, true);
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index c80a600b72972c2e8b7d472e2e11c312adaa06e1..0f7189ee1b16717ca2011e69e645a5960e8aa32e 100644
index 49821f441886b4de2cac5b1b13981e2161992f98..bb0f7c631b4889e95a87214fbc0537a0e420d87f 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1721,7 +1721,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1726,7 +1726,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@DontObfuscate
public String getServerModName() {
@@ -144,7 +144,7 @@ index e2901132b78126c0a4eb04363dfe6a0dccd1313f..69dae20c0ff581359042899d615ebcdd
// Spigot end
DedicatedServer.LOGGER.warn("To change this, set \"online-mode\" to \"true\" in the server.properties file.");
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index c987e7c46afe6c41339e8e08bf2bfabe8c1ba098..e28807ab2613982c87d8c7daab3bea60c9f0c137 100644
index ae2c4388eddef529fba5d5eae354ee15c6e36c9d..f8bdba7d03d93d309b687261a33bcc76287a184b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -251,7 +251,7 @@ import javax.annotation.Nullable; // Paper