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

Fix messed up logic in last commit :3

Browse Source
This commit is contained in:
William Blake Galbreath
2020-03-29 16:23:53 -05:00
parent 4cb9c38103
commit 93bb79d462
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0047-Make-the-GUI-better.patch
View File

@@ -1,4 +1,4 @@
From d51fde7552678cd9c35c324153d7e1cd4e8bd1a4 Mon Sep 17 00:00:00 2001 From ff97f6b0269e505297cf44e443e448d123f7d220 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com> From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 16 Jan 2020 14:59:16 -0600 Date: Thu, 16 Jan 2020 14:59:16 -0600
Subject: [PATCH] Make the GUI better Subject: [PATCH] Make the GUI better
@@ -40,7 +40,7 @@ Subject: [PATCH] Make the GUI better
create mode 100644 src/main/java/net/pl3x/purpur/util/HighlightErrorConverter.java create mode 100644 src/main/java/net/pl3x/purpur/util/HighlightErrorConverter.java
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index d70c8cab2..46749372b 100644 index d70c8cab2..1c1a34e69 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java --- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -8,6 +8,8 @@ import com.mojang.authlib.GameProfileRepository; @@ -8,6 +8,8 @@ import com.mojang.authlib.GameProfileRepository;
@@ -65,7 +65,7 @@ index d70c8cab2..46749372b 100644
return; return;
} }
// Paper start - Use TerminalConsoleAppender // Paper start - Use TerminalConsoleAppender
+ if (DedicatedServer.this.p == null && System.console() != null) // Purpur - has GUI but no console (double clicked jar) + if (DedicatedServer.this.p == null || System.console() != null) // Purpur - has no GUI or has console (did not double click)
new com.destroystokyo.paper.console.PaperConsole(DedicatedServer.this).start(); new com.destroystokyo.paper.console.PaperConsole(DedicatedServer.this).start();
/* /*
jline.console.ConsoleReader bufferedreader = reader; jline.console.ConsoleReader bufferedreader = reader;