2016-03-03 09:46:26 +00:00
|
|
|
From 451930ce992808fcdfd35ed1d385be7d1fb9c08b Mon Sep 17 00:00:00 2001
|
2015-01-29 21:25:50 +00:00
|
|
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
2016-02-29 23:09:49 +00:00
|
|
|
Date: Tue, 1 Mar 2016 14:32:43 -0600
|
|
|
|
Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang
|
|
|
|
stats
|
2014-08-19 19:26:33 +00:00
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
2016-03-03 09:46:26 +00:00
|
|
|
index 4cc436d..11dbde5 100644
|
2014-08-19 19:26:33 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
2016-03-03 09:46:26 +00:00
|
|
|
@@ -1022,7 +1022,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
|
2014-08-19 19:26:33 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
public String getServerModName() {
|
|
|
|
- return "Spigot"; // Spigot - Spigot > // CraftBukkit - cb > vanilla!
|
2016-02-29 23:09:49 +00:00
|
|
|
+ return "Paper"; //Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
|
2014-08-19 19:26:33 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
public CrashReport b(CrashReport crashreport) {
|
2016-02-29 23:09:49 +00:00
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
|
|
index 7e5870f..40998cf 100644
|
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
|
|
@@ -130,7 +130,7 @@ import net.md_5.bungee.api.chat.BaseComponent;
|
|
|
|
|
|
|
|
public final class CraftServer implements Server {
|
|
|
|
private static final Player[] EMPTY_PLAYER_ARRAY = new Player[0];
|
|
|
|
- private final String serverName = "CraftBukkit";
|
|
|
|
+ private final String serverName = "Paper";
|
|
|
|
private final String serverVersion;
|
|
|
|
private final String bukkitVersion = Versioning.getBukkitVersion();
|
|
|
|
private final Logger logger = Logger.getLogger("Minecraft");
|
2015-10-17 02:50:04 +00:00
|
|
|
diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
|
2016-02-29 23:09:49 +00:00
|
|
|
index 94a3d42..3ed983c 100644
|
2015-10-17 02:50:04 +00:00
|
|
|
--- a/src/main/java/org/spigotmc/WatchdogThread.java
|
|
|
|
+++ b/src/main/java/org/spigotmc/WatchdogThread.java
|
|
|
|
@@ -19,7 +19,7 @@ public class WatchdogThread extends Thread
|
|
|
|
|
|
|
|
private WatchdogThread(long timeoutTime, boolean restart)
|
|
|
|
{
|
|
|
|
- super( "Spigot Watchdog Thread" );
|
2016-02-29 23:09:49 +00:00
|
|
|
+ super( "Paper Watchdog Thread" );
|
2015-10-17 02:50:04 +00:00
|
|
|
this.timeoutTime = timeoutTime;
|
|
|
|
this.restart = restart;
|
|
|
|
}
|
|
|
|
@@ -56,9 +56,9 @@ public class WatchdogThread extends Thread
|
|
|
|
{
|
|
|
|
Logger log = Bukkit.getServer().getLogger();
|
|
|
|
log.log( Level.SEVERE, "The server has stopped responding!" );
|
|
|
|
- log.log( Level.SEVERE, "Please report this to http://www.spigotmc.org/" );
|
2016-02-29 23:09:49 +00:00
|
|
|
+ log.log( Level.SEVERE, "Please report this to https://aquifermc.org/" );
|
2015-10-17 02:50:04 +00: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-02-29 23:09:49 +00:00
|
|
|
+ log.log( Level.SEVERE, "Paper version: " + Bukkit.getServer().getVersion() );
|
2015-10-17 02:50:04 +00:00
|
|
|
//
|
|
|
|
if(net.minecraft.server.World.haveWeSilencedAPhysicsCrash)
|
|
|
|
{
|
|
|
|
@@ -68,7 +68,7 @@ public class WatchdogThread extends Thread
|
|
|
|
}
|
|
|
|
//
|
|
|
|
log.log( Level.SEVERE, "------------------------------" );
|
|
|
|
- log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Spigot!):" );
|
2016-02-29 23:09:49 +00:00
|
|
|
+ log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):" );
|
2015-10-17 02:50:04 +00:00
|
|
|
dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().primaryThread.getId(), Integer.MAX_VALUE ), log );
|
|
|
|
log.log( Level.SEVERE, "------------------------------" );
|
|
|
|
//
|
2014-08-19 19:26:33 +00:00
|
|
|
--
|
2016-02-29 23:09:49 +00:00
|
|
|
2.7.2
|
2014-08-19 19:26:33 +00:00
|
|
|
|