From 43c3a7b1694b2ee2c270f65b3db616512662deea Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 16 Oct 2015 21:50:04 -0500 Subject: [PATCH] Don't point users at spigotmc when watchdog kills the server --- ...-in-client-crashes-server-lists-and-.patch | 38 ++++++++++++++++++- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/Spigot-Server-Patches/0019-Show-PaperSpigot-in-client-crashes-server-lists-and-.patch b/Spigot-Server-Patches/0019-Show-PaperSpigot-in-client-crashes-server-lists-and-.patch index 204ea49..7490217 100644 --- a/Spigot-Server-Patches/0019-Show-PaperSpigot-in-client-crashes-server-lists-and-.patch +++ b/Spigot-Server-Patches/0019-Show-PaperSpigot-in-client-crashes-server-lists-and-.patch @@ -1,4 +1,4 @@ -From 7f66f69455e113664eaffd38fc0a8c4f1b37d8ad Mon Sep 17 00:00:00 2001 +From 98de4059bdb6cc1443c58be63c829dfea29d11cb Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 7 Mar 2015 22:55:25 -0600 Subject: [PATCH] Show 'PaperSpigot' in client crashes, server lists, and @@ -18,6 +18,40 @@ index 1d29ae7..9fc2cfa 100644 } public CrashReport b(CrashReport crashreport) { +diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java +index 94a3d42..c8f619a 100644 +--- 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" ); ++ super( "PaperSpigot Watchdog Thread" ); + 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/" ); ++ log.log( Level.SEVERE, "Please report this to PaperSpigot directly!" ); + 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() ); ++ log.log( Level.SEVERE, "PaperSpigot version: " + Bukkit.getServer().getVersion() ); + // + 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!):" ); ++ log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to PaperSpigot!):" ); + dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().primaryThread.getId(), Integer.MAX_VALUE ), log ); + log.log( Level.SEVERE, "------------------------------" ); + // -- -2.5.2 +2.6.1.windows.1