2020-05-06 17:48:49 +08:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2015-01-30 05:25:50 +08:00
From: Zach Brown <zach.brown@destroystokyo.com>
2016-03-01 07:09:49 +08:00
Date: Tue, 1 Mar 2016 14:32:43 -0600
Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang
stats
2014-08-20 03:26:33 +08:00
2016-03-16 15:57:49 +08:00
diff --git a/src/main/java/net/minecraft/server/EULA.java b/src/main/java/net/minecraft/server/EULA.java
2020-05-06 17:48:49 +08:00
index 3f35a28ba15f4d0dfe1cb2b56f621e81b1fb8c99..cf00f35a5b7c2d2f6b6989e0855de8b882dcef50 100644
2016-03-16 15:57:49 +08:00
--- a/src/main/java/net/minecraft/server/EULA.java
+++ b/src/main/java/net/minecraft/server/EULA.java
2019-04-24 09:00:24 +08:00
@@ -70,7 +70,7 @@ public class EULA {
Properties properties = new Properties();
2019-01-01 11:15:55 +08:00
2019-04-24 09:00:24 +08:00
properties.setProperty("eula", "false");
- properties.store(outputstream, "By changing the setting below to TRUE you are indicating your agreement to our EULA (https://account.mojang.com/documents/minecraft_eula).");
+ properties.store(outputstream, "By changing the setting below to TRUE you are indicating your agreement to our EULA (https://account.mojang.com/documents/minecraft_eula).\nYou also agree that tacos are tasty, and the best food in the world."); // Paper - fix lag;
} catch (Throwable throwable1) {
throwable = throwable1;
throw throwable1;
2014-08-20 03:26:33 +08:00
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
2020-05-17 09:38:19 +08:00
index 5429d8eee93980a01cdf008b57e88e1dccc1ef67..b6912f97c2240b0524735e0f8d1937f2e76dba5b 100644
2014-08-20 03:26:33 +08:00
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
2020-05-17 09:38:19 +08:00
@@ -1348,7 +1348,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
2014-08-20 03:26:33 +08:00
}
public String getServerModName() {
- return "Spigot"; // Spigot - Spigot > // CraftBukkit - cb > vanilla!
2016-03-01 07:09:49 +08:00
+ return "Paper"; //Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
2014-08-20 03:26:33 +08:00
}
public CrashReport b(CrashReport crashreport) {
2016-03-01 07:09:49 +08:00
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
2020-05-06 17:48:49 +08:00
index 1ceba5f7eae58426834d7042af17f7e3b1990a56..ee749863730cb2228712ceddd4e405a798f73c5e 100644
2016-03-01 07:09:49 +08:00
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
2020-02-02 19:53:48 +08:00
@@ -199,7 +199,7 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
2019-04-24 09:00:24 +08:00
import net.md_5.bungee.api.chat.BaseComponent; // Spigot
2016-03-01 07:09:49 +08:00
public final class CraftServer implements Server {
- private final String serverName = "CraftBukkit";
2018-07-15 09:53:17 +08:00
+ private final String serverName = "Paper"; // Paper
2016-03-01 07:09:49 +08:00
private final String serverVersion;
private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft");
2017-05-27 11:46:27 +08:00
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
2020-05-06 17:48:49 +08:00
index 101d5b42e319c010fd7ed043fb17d1f2289ae38f..1ee40506095ed14f50b4b8031bb882e9bea475b5 100644
2017-05-27 11:46:27 +08:00
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
2020-04-27 15:34:45 +08:00
@@ -200,12 +200,25 @@ public class Main {
deadline.add(Calendar.DAY_OF_YEAR, -21);
2017-05-27 11:46:27 +08:00
if (buildDate.before(deadline.getTime())) {
System.err.println("*** Error, this build is outdated ***");
2019-02-11 05:17:18 +08:00
- System.err.println("*** Please download a new build as per instructions from https://www.spigotmc.org/go/outdated-spigot ***");
2018-12-03 07:31:09 +08:00
+ System.err.println("*** Please download a new build as per instructions from https://papermc.io/downloads ***"); // Paper
2018-08-03 07:29:34 +08:00
System.err.println("*** Server will start in 20 seconds ***");
Thread.sleep(TimeUnit.SECONDS.toMillis(20));
2017-05-27 11:46:27 +08:00
}
2018-10-29 09:03:06 +08:00
}
+ // 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() + ")";
2020-02-19 12:57:49 +08:00
+ String osInfo = "Host: " + osMX.getName() + " " + osMX.getVersion() + " (" + osMX.getArch() + ")";
2018-10-29 09:03:06 +08:00
+
+ System.out.println("System Info: " + javaInfo + " " + osInfo);
+ } else {
+ System.out.println("Unable to read system info");
+ }
+ // Paper end
2018-11-03 08:23:27 +08:00
+
2018-10-29 09:03:06 +08:00
System.out.println("Loading libraries, please wait...");
MinecraftServer.main(options);
2018-11-03 08:23:27 +08:00
} catch (Throwable t) {
2015-10-17 10:50:04 +08:00
diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
2020-05-06 17:48:49 +08:00
index 54fa83c127bf2f8fe30295864f5f73cf6248ad28..73fa74e3cc0239a38cd2ba41b3e9e991a5c4ebf9 100644
2015-10-17 10:50:04 +08:00
--- a/src/main/java/org/spigotmc/WatchdogThread.java
+++ b/src/main/java/org/spigotmc/WatchdogThread.java
2016-05-13 12:04:49 +08:00
@@ -19,7 +19,7 @@ public class WatchdogThread extends Thread
2015-10-17 10:50:04 +08:00
private WatchdogThread(long timeoutTime, boolean restart)
{
- super( "Spigot Watchdog Thread" );
2016-03-01 07:09:49 +08:00
+ super( "Paper Watchdog Thread" );
2015-10-17 10:50:04 +08:00
this.timeoutTime = timeoutTime;
this.restart = restart;
}
2018-11-24 13:28:04 +08:00
@@ -61,14 +61,14 @@ public class WatchdogThread extends Thread
2015-10-17 10:50:04 +08:00
{
Logger log = Bukkit.getServer().getLogger();
2018-11-24 13:28:04 +08:00
log.log( Level.SEVERE, "------------------------------" );
- log.log( Level.SEVERE, "The server has stopped responding! This is (probably) not a Spigot bug." );
+ log.log( Level.SEVERE, "The server has stopped responding! This is (probably) not a Paper bug." ); // Paper
log.log( Level.SEVERE, "If you see a plugin in the Server thread dump below, then please report it to that author" );
log.log( Level.SEVERE, "\t *Especially* if it looks like HTTP or MySQL operations are occurring" );
log.log( Level.SEVERE, "If you see a world save or edit, then it means you did far more than your server can handle at once" );
log.log( Level.SEVERE, "\t If this is the case, consider increasing timeout-time in spigot.yml but note that this will replace the crash with LARGE lag spikes" );
- log.log( Level.SEVERE, "If you are unsure or still think this is a Spigot bug, please report to https://www.spigotmc.org/" );
+ log.log( Level.SEVERE, "If you are unsure or still think this is a Paper bug, please report this to https://github.com/PaperMC/Paper/issues" );
2015-10-17 10:50:04 +08:00
log.log( Level.SEVERE, "Be sure to include ALL relevant console errors and Minecraft crash reports" );
- log.log( Level.SEVERE, "Spigot version: " + Bukkit.getServer().getVersion() );
2016-03-01 07:09:49 +08:00
+ log.log( Level.SEVERE, "Paper version: " + Bukkit.getServer().getVersion() );
2015-10-17 10:50:04 +08:00
//
2019-02-03 23:34:04 +08:00
if ( net.minecraft.server.World.lastPhysicsProblem != null )
2015-10-17 10:50:04 +08:00
{
2018-11-24 13:28:04 +08:00
@@ -78,7 +78,7 @@ public class WatchdogThread extends Thread
2015-10-17 10:50:04 +08:00
}
//
log.log( Level.SEVERE, "------------------------------" );
- log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Spigot!):" );
2019-04-24 09:00:24 +08:00
+ log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):" ); // Paper
dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().serverThread.getId(), Integer.MAX_VALUE ), log );
2015-10-17 10:50:04 +08:00
log.log( Level.SEVERE, "------------------------------" );
//