diff options
| author | Shane Freeder <[email protected]> | 2021-12-03 00:26:54 +0000 |
|---|---|---|
| committer | Shane Freeder <[email protected]> | 2021-12-03 00:26:54 +0000 |
| commit | cfa5b37fa86220b30bdd94981ca30a1bd2e2e95d (patch) | |
| tree | bce752c55444b113dd7d506d9ad2b04fadb2934f /patches/server/0020-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch | |
| parent | 057adb04f18f319dafeecd2e4294dd090c8360d1 (diff) | |
| download | Paper-cfa5b37fa86220b30bdd94981ca30a1bd2e2e95d.tar.gz Paper-cfa5b37fa86220b30bdd94981ca30a1bd2e2e95d.zip | |
Updated Upstream (CraftBukkit)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
CraftBukkit Changes:
03b725233 SPIGOT-6823: Fix loading custom world in combination with superflat
359d0533a #970: Correct typo in README.md
110492932 Fix per-world worldborder command
Diffstat (limited to 'patches/server/0020-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch')
| -rw-r--r-- | patches/server/0020-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/server/0020-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/patches/server/0020-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch index 0776c819e0..0ded9fbd57 100644 --- a/patches/server/0020-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch +++ b/patches/server/0020-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch @@ -19,10 +19,10 @@ index 2c53a400611c78236c5a1c1270d27c02e94251bf..a1d5c0f8fe2adb2ee56f3217e089211e if (outputStream != null) { try { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 37ace477c170be9453ab65976085837faa312255..15163398f96b4eda94d99b4b48ab2b06622bd2af 100644 +index 844f24fd16aac25bf681bd3e98f0737be62bead6..f1dfb56d0158d36b583b5ee5596235540b2cb11c 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1426,7 +1426,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa +@@ -1427,7 +1427,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa @DontObfuscate public String getServerModName() { @@ -32,10 +32,10 @@ index 37ace477c170be9453ab65976085837faa312255..15163398f96b4eda94d99b4b48ab2b06 public SystemReport fillSystemReport(SystemReport details) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index dea0b0d3164737b72d84679f2128fc82e1e03230..4b44fb9584f1b85ff183e52542154c7fd7f46332 100644 +index cf79b158c7fbbb3ccddd4472eceb27d6f238f489..cfdc78fe0820d47d8af055e844b08ea003d74368 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -251,7 +251,7 @@ import org.yaml.snakeyaml.error.MarkedYAMLException; +@@ -249,7 +249,7 @@ import org.yaml.snakeyaml.error.MarkedYAMLException; import net.md_5.bungee.api.chat.BaseComponent; // Spigot public final class CraftServer implements Server { |