diff options
author | Nassim Jahnke <[email protected]> | 2024-01-25 10:54:46 +0100 |
---|---|---|
committer | Nassim Jahnke <[email protected]> | 2024-01-25 12:10:23 +0100 |
commit | b03f255532bba5a1398f03207756f42e5597ccb8 (patch) | |
tree | a420815beecbcd8bdd4dbb4ca2275ac7827c0033 /patches/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch | |
parent | 1831240d1c48086fc0199584787cd2013d4d4b5f (diff) | |
download | Paper-b03f255532bba5a1398f03207756f42e5597ccb8.tar.gz Paper-b03f255532bba5a1398f03207756f42e5597ccb8.zip |
Finish moving patches back and improving compilable state
Diffstat (limited to 'patches/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch')
-rw-r--r-- | patches/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/patches/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch index d395a0f02a..139de64984 100644 --- a/patches/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch +++ b/patches/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index a6a8b5079ceaad90a79a09cab5c38a6fde6d33ee..de8b12b5014e653cb96d422c74307c7fbfd1b5b5 100644 +index c99da8c4810385600470a0c3b4c03670edd0759b..107a04f6c5889e98c183a932ad158fb5b6591a10 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1552,7 +1552,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa +@@ -1615,7 +1615,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa @DontObfuscate public String getServerModName() { @@ -19,7 +19,7 @@ index a6a8b5079ceaad90a79a09cab5c38a6fde6d33ee..de8b12b5014e653cb96d422c74307c7f 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 cfac91359e6084082fffd769fc8ce91f75717b1d..4fbc98bc2fe808a15f974b0abf614781fe66e1c4 100644 +index 3b2f99617a519c2c2f60b88a4679064c01e5d958..9b85ec9e9a66a5bc0c98598531102f01e597f525 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -261,7 +261,7 @@ import org.yaml.snakeyaml.error.MarkedYAMLException; |