mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Updated Upstream (Bukkit/CraftBukkit/Spigot) (#8347)

Browse source
This commit is contained in:
Jake Potrebic 2022-09-09 11:54:00 -07:00 • committed by GitHub
parent 36a5f150c5
commit e51401e764
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
62 changed files with 150 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

8
patches/server/0141-Use-TerminalConsoleAppender-for-console-improvements.patch
View file

@ -262,7 +262,7 @@ index 6109763453327f49a15c677a3af8f2de959b58cc..8da0beff6a7937130ecd99dd46880da0
@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 04e7295ab4ec7e417ebb272f5f1b26721dfbb476..a2fda01d1995c655ae562436b49a1be90129e7bb 100644
index d5f3b44f950ffba5b2680bd2ca5826aae3df2aca..773fe0f425053a450c7b14faf016a35f1d0d266f 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -12,7 +12,7 @@ import java.util.logging.Level;
@ -274,7 +274,7 @@ index 04e7295ab4ec7e417ebb272f5f1b26721dfbb476..a2fda01d1995c655ae562436b49a1be9
public class Main {
public static boolean useJline = true;
@@ -200,6 +200,8 @@ public class Main {
@@ -202,6 +202,8 @@ public class Main {
}
try {
@ -283,7 +283,7 @@ index 04e7295ab4ec7e417ebb272f5f1b26721dfbb476..a2fda01d1995c655ae562436b49a1be9
// This trick bypasses Maven Shade's clever rewriting of our getProperty call when using String literals
String jline_UnsupportedTerminal = new String(new char[]{'j', 'l', 'i', 'n', 'e', '.', 'U', 'n', 's', 'u', 'p', 'p', 'o', 'r', 't', 'e', 'd', 'T', 'e', 'r', 'm', 'i', 'n', 'a', 'l'});
String jline_terminal = new String(new char[]{'j', 'l', 'i', 'n', 'e', '.', 't', 'e', 'r', 'm', 'i', 'n', 'a', 'l'});
@@ -217,9 +219,18 @@ public class Main {
@@ -219,9 +221,18 @@ public class Main {
// This ensures the terminal literal will always match the jline implementation
System.setProperty(jline.TerminalFactory.JLINE_TERMINAL, jline.UnsupportedTerminal.class.getName());
}
@ -302,7 +302,7 @@ index 04e7295ab4ec7e417ebb272f5f1b26721dfbb476..a2fda01d1995c655ae562436b49a1be9
}
if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
@@ -247,7 +258,7 @@ public class Main {
@@ -249,7 +260,7 @@ public class Main {
System.out.println("Unable to read system info");
}
// Paper end