From 3e30f3aef08d1ec9b37ca1014c7dd34d97c3e7ba Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Fri, 24 Jan 2020 21:30:15 +0000 Subject: [PATCH] Revert "Fix errors on startup when double clicking jar (#2901)" This reverts commit bd700c2f78fcb815cb84838751e7b1fb82564305. --- ...e-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch | 2 +- ...e-TerminalConsoleAppender-for-console-improvements.patch | 6 ++---- .../Use-a-Queue-for-Queueing-Commands.patch | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Spigot-Server-Patches/Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch b/Spigot-Server-Patches/Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch index ac46ffeb26..5dbd96ec2f 100644 --- a/Spigot-Server-Patches/Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch +++ b/Spigot-Server-Patches/Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch @@ -28,7 +28,7 @@ index 93c1a04bc..663eacfe2 100644 org.ow2.asm asm diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 999361e34..5fee3f9a9 100644 +index 886900006..0411fb3ee 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -0,0 +0,0 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer diff --git a/Spigot-Server-Patches/Use-TerminalConsoleAppender-for-console-improvements.patch b/Spigot-Server-Patches/Use-TerminalConsoleAppender-for-console-improvements.patch index 081315764b..362c8baba2 100644 --- a/Spigot-Server-Patches/Use-TerminalConsoleAppender-for-console-improvements.patch +++ b/Spigot-Server-Patches/Use-TerminalConsoleAppender-for-console-improvements.patch @@ -143,7 +143,7 @@ index 000000000..685deaa0e + +} diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index a78896dc8..999361e34 100644 +index a78896dc8..886900006 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -0,0 +0,0 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -151,9 +151,7 @@ index a78896dc8..999361e34 100644 return; } + // Paper start - Use TerminalConsoleAppender -+ if (System.console() != null) { -+ new com.destroystokyo.paper.console.PaperConsole(DedicatedServer.this).start(); -+ } ++ new com.destroystokyo.paper.console.PaperConsole(DedicatedServer.this).start(); + /* jline.console.ConsoleReader bufferedreader = reader; // CraftBukkit end diff --git a/Spigot-Server-Patches/Use-a-Queue-for-Queueing-Commands.patch b/Spigot-Server-Patches/Use-a-Queue-for-Queueing-Commands.patch index 83f4ac67c9..853d0b9064 100644 --- a/Spigot-Server-Patches/Use-a-Queue-for-Queueing-Commands.patch +++ b/Spigot-Server-Patches/Use-a-Queue-for-Queueing-Commands.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Use a Queue for Queueing Commands Lists are bad as Queues mmmkay. diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 5fee3f9a9..d9dee47f8 100644 +index 0411fb3ee..a74fae9ed 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -0,0 +0,0 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer