From a3978b527d4a2fef2c7611cd442c1db57d6a4889 Mon Sep 17 00:00:00 2001 From: Runemoro Date: Wed, 13 Mar 2013 18:28:49 +1100 Subject: [PATCH] Restart even if restart script is not found --- CraftBukkit-Patches/0028-Watchdog-Thread.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CraftBukkit-Patches/0028-Watchdog-Thread.patch b/CraftBukkit-Patches/0028-Watchdog-Thread.patch index 2e7f65176..5e6fa1bac 100644 --- a/CraftBukkit-Patches/0028-Watchdog-Thread.patch +++ b/CraftBukkit-Patches/0028-Watchdog-Thread.patch @@ -1,4 +1,4 @@ -From 51ae704ad3290541373ec51570d48c9e66743f5c Mon Sep 17 00:00:00 2001 +From 8c47249526c029b0fd635fe1dc4402143b0b6eb3 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Feb 2013 12:33:20 +1100 Subject: [PATCH] Watchdog Thread. @@ -34,7 +34,7 @@ index aa6a14a..6005fac 100644 this.isStopped = true; } catch (Throwable throwable1) { diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java -index 83018b0..931f6fd 100644 +index e083480..6713281 100644 --- a/src/main/java/org/bukkit/craftbukkit/Spigot.java +++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java @@ -1,5 +1,6 @@ @@ -145,10 +145,10 @@ index 83018b0..931f6fd 100644 + + shutdownHook.setDaemon(true); + Runtime.getRuntime().addShutdownHook(shutdownHook); -+ System.exit(0); + } else { -+ System.out.println("Startup script '" + startupScript + "' does not exist!"); ++ System.out.println("Startup script '" + startupScript + "' does not exist! Stopping server."); + } ++ System.exit(0); + } catch (Exception ex) { + ex.printStackTrace(); + } @@ -297,5 +297,5 @@ index e568bf6..7c18391 100644 default: growth-chunks-per-tick: 650 -- -1.8.1.1 +1.8.1-rc2