mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-15 07:01:36 +08:00
Log system info and remove paperclip java 9 warn
Removes the paperclip Java 9+ warning and replaces it with general JVM and Host OS information that will be more useful in finding issues for end users and ourselves. Also removes the "for development only" 1.13 warning that everyone has been ignoring completely anyway.
This commit is contained in:
parent
ece0b19c59
commit
d6033a37e5
@ -1,4 +1,4 @@
|
|||||||
From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
|
From 68a9bbb09750538538bbcd3188803b142ba3f4e0 Mon Sep 17 00:00:00 2001
|
||||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||||
Date: Tue, 1 Mar 2016 14:32:43 -0600
|
Date: Tue, 1 Mar 2016 14:32:43 -0600
|
||||||
Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang
|
Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang
|
||||||
@ -6,7 +6,7 @@ Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang
|
|||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/EULA.java b/src/main/java/net/minecraft/server/EULA.java
|
diff --git a/src/main/java/net/minecraft/server/EULA.java b/src/main/java/net/minecraft/server/EULA.java
|
||||||
index 7ac07ac07ac0..7ac07ac07ac0 100644
|
index b64cac252..cc333de50 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EULA.java
|
--- a/src/main/java/net/minecraft/server/EULA.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EULA.java
|
+++ b/src/main/java/net/minecraft/server/EULA.java
|
||||||
@@ -49,13 +49,12 @@ public class EULA {
|
@@ -49,13 +49,12 @@ public class EULA {
|
||||||
@ -25,7 +25,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
index 7ac07ac07ac0..7ac07ac07ac0 100644
|
index 2d812b024..8a6589d95 100644
|
||||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
@@ -1213,7 +1213,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
|
@@ -1213,7 +1213,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
|
||||||
@ -38,7 +38,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
|
|||||||
|
|
||||||
public CrashReport b(CrashReport crashreport) {
|
public CrashReport b(CrashReport crashreport) {
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
index 7ac07ac07ac0..7ac07ac07ac0 100644
|
index b34a3564c..3a8e3ee81 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
@@ -159,7 +159,7 @@ import org.bukkit.event.server.TabCompleteEvent;
|
@@ -159,7 +159,7 @@ import org.bukkit.event.server.TabCompleteEvent;
|
||||||
@ -51,10 +51,10 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
|
|||||||
private final String bukkitVersion = Versioning.getBukkitVersion();
|
private final String bukkitVersion = Versioning.getBukkitVersion();
|
||||||
private final Logger logger = Logger.getLogger("Minecraft");
|
private final Logger logger = Logger.getLogger("Minecraft");
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||||
index 7ac07ac07ac0..7ac07ac07ac0 100644
|
index 31c7404c3..1ce1a2435 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
|
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||||
@@ -200,7 +200,7 @@ public class Main {
|
@@ -200,13 +200,24 @@ public class Main {
|
||||||
deadline.add(Calendar.DAY_OF_YEAR, -7);
|
deadline.add(Calendar.DAY_OF_YEAR, -7);
|
||||||
if (buildDate.before(deadline.getTime())) {
|
if (buildDate.before(deadline.getTime())) {
|
||||||
System.err.println("*** Error, this build is outdated ***");
|
System.err.println("*** Error, this build is outdated ***");
|
||||||
@ -63,8 +63,26 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
|
|||||||
System.err.println("*** Server will start in 20 seconds ***");
|
System.err.println("*** Server will start in 20 seconds ***");
|
||||||
Thread.sleep(TimeUnit.SECONDS.toMillis(20));
|
Thread.sleep(TimeUnit.SECONDS.toMillis(20));
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- System.err.println("*** WARNING: This is a development build. It is not meant for production server usage! Please keep backups and update frequently.");
|
||||||
|
+ // Paper start - Log Java and OS versioning to help with debugging plugin issues
|
||||||
|
+ java.lang.management.RuntimeMXBean runtimeMX = java.lang.management.ManagementFactory.getRuntimeMXBean();
|
||||||
|
+ java.lang.management.OperatingSystemMXBean osMX = java.lang.management.ManagementFactory.getOperatingSystemMXBean();
|
||||||
|
+ if (runtimeMX != null && osMX != null) {
|
||||||
|
+ String javaInfo = "Java " + runtimeMX.getSpecVersion() + " (" + runtimeMX.getVmName() + " " + runtimeMX.getVmVersion() + ")";
|
||||||
|
+ String osInfo = "Host: " + osMX.getName() + " " + osMX.getVersion() + " (" + osMX.getArch() + ")";
|
||||||
|
+
|
||||||
|
+ System.out.println("System Info: " + javaInfo + " " + osInfo);
|
||||||
|
+ } else {
|
||||||
|
+ System.out.println("Unable to read system info");
|
||||||
|
+ }
|
||||||
|
+ // Paper end
|
||||||
|
|
||||||
|
System.out.println("Loading libraries, please wait...");
|
||||||
|
MinecraftServer.main(options);
|
||||||
diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
|
diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
|
||||||
index 7ac07ac07ac0..7ac07ac07ac0 100644
|
index 94a3d4237..91b8aa6a1 100644
|
||||||
--- a/src/main/java/org/spigotmc/WatchdogThread.java
|
--- a/src/main/java/org/spigotmc/WatchdogThread.java
|
||||||
+++ b/src/main/java/org/spigotmc/WatchdogThread.java
|
+++ b/src/main/java/org/spigotmc/WatchdogThread.java
|
||||||
@@ -19,7 +19,7 @@ public class WatchdogThread extends Thread
|
@@ -19,7 +19,7 @@ public class WatchdogThread extends Thread
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit 6b0c27538a39d187202e7dc5eff7052edec611d6
|
Subproject commit d4ceaa7405d1d8e480cf201d45eff7194741a06f
|
Loading…
Reference in New Issue
Block a user