Mirrors/Paper
3
0
Fork 1
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-20 21:40:06 +01:00
Code Issues Projekte Releases Wiki Aktivität

update upstream

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Aikar 2017-06-20 18:53:55 -04:00
Ursprung 272f130b5a
Commit 825834273c
2 geänderte Dateien mit 17 neuen und 17 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

32
Spigot-Server-Patches/0211-Use-TerminalConsoleAppender-for-console-improvements.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 9b8fcb9caa1f2b98bb581d44410c08dfb7d31d9c Mon Sep 17 00:00:00 2001
From 8b416ec6a4a7b59a7f1c5cee2f6d1e4124b5fa62 Mon Sep 17 00:00:00 2001
From: Minecrell <dev@minecrell.net>
Date: Fri, 9 Jun 2017 19:03:43 +0200
Subject: [PATCH] Use TerminalConsoleAppender for console improvements
@ -20,7 +20,7 @@ Other changes:
configuration
diff --git a/pom.xml b/pom.xml
index cf00ee13..96f87cb6 100644
index cf00ee13d..96f87cb68 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,12 +47,6 @@
@ -96,7 +96,7 @@ index cf00ee13..96f87cb6 100644
<groupId>org.apache.maven.plugins</groupId>
diff --git a/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
new file mode 100644
index 00000000..24f30efb
index 000000000..24f30efbb
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
@@ -0,0 +1,13 @@
@ -115,7 +115,7 @@ index 00000000..24f30efb
+}
diff --git a/src/main/java/com/destroystokyo/paper/console/TerminalHandler.java b/src/main/java/com/destroystokyo/paper/console/TerminalHandler.java
new file mode 100644
index 00000000..d5bc6149
index 000000000..d5bc61490
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/console/TerminalHandler.java
@@ -0,0 +1,60 @@
@ -180,7 +180,7 @@ index 00000000..d5bc6149
+
+}
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index 2feeb855..3266df1f 100644
index 2feeb855b..3266df1f5 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -73,7 +73,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@ -233,7 +233,7 @@ index 2feeb855..3266df1f 100644
System.setOut(new PrintStream(new LoggerOutputStream(logger, Level.INFO), true));
System.setErr(new PrintStream(new LoggerOutputStream(logger, Level.WARN), true));
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index d84f59da..8ca8fdce 100644
index d84f59da1..8ca8fdceb 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -41,7 +41,6 @@ import org.apache.commons.lang3.Validate;
@ -292,7 +292,7 @@ index d84f59da..8ca8fdce 100644
public boolean a(int i, String s) {
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 0c328782..ed0a749e 100644
index 0c3287823..ed0a749e1 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -76,8 +76,7 @@ public abstract class PlayerList {
@ -306,7 +306,7 @@ index 0c328782..ed0a749e 100644
this.k = new GameProfileBanList(PlayerList.a);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 463f5890..df6a75b0 100644
index 463f58906..df6a75b05 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -127,7 +127,6 @@ import io.netty.buffer.ByteBuf;
@ -332,7 +332,7 @@ index 463f5890..df6a75b0 100644
@Override
public PluginCommand getPluginCommand(String name) {
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 634cde14..ff805c9a 100644
index 634cde14a..ff805c9ac 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -14,7 +14,7 @@ import java.util.logging.Logger;
@ -374,7 +374,7 @@ index 634cde14..ff805c9a 100644
if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
diff --git a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java b/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
deleted file mode 100644
index 26a2fb89..00000000
index 26a2fb894..000000000
--- a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
+++ /dev/null
@@ -1,74 +0,0 @@
@ -453,7 +453,7 @@ index 26a2fb89..00000000
- }
-}
diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
index 33e8ea02..1e3aae3b 100644
index 33e8ea02c..1e3aae3b8 100644
--- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
+++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
@@ -8,17 +8,27 @@ import java.util.logging.Level;
@ -532,10 +532,10 @@ index 33e8ea02..1e3aae3b 100644
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
index ae3481ba..6a38025e 100644
index a0cdd2317..0a1812883 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
@@ -18,7 +18,7 @@ public class ServerShutdownThread extends Thread {
@@ -19,7 +19,7 @@ public class ServerShutdownThread extends Thread {
ex.printStackTrace();
} finally {
try {
@ -546,7 +546,7 @@ index ae3481ba..6a38025e 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java b/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java
deleted file mode 100644
index b6409711..00000000
index b64097113..000000000
--- a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java
+++ /dev/null
@@ -1,54 +0,0 @@
@ -605,7 +605,7 @@ index b6409711..00000000
- }
-}
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index 5cee8f00..08b6bb7f 100644
index 5cee8f00e..08b6bb7f9 100644
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@@ -1,12 +1,11 @@
@ -635,5 +635,5 @@ index 5cee8f00..08b6bb7f 100644
<AppenderRef ref="TerminalConsole" level="info"/>
</Root>
--
2.13.1.windows.2
2.13.0

2
work/Spigot

@ -1 +1 @@
Subproject commit 0869666b3a7730fbecb02fbbf8d7fefec3b1173a
Subproject commit 4df3c0ca36fc1f84d4cb26b944357bfa0ee7e68a