From 0d52f683db2cc482636355dc2e954fa87060a270 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 25 Jan 2015 10:31:31 +1100
Subject: SPIGOT-469: Increment and print reload count.

---
 src/main/java/org/bukkit/craftbukkit/CraftCrashReport.java | 1 +
 src/main/java/org/bukkit/craftbukkit/CraftServer.java      | 2 ++
 2 files changed, 3 insertions(+)

(limited to 'src')

diff --git a/src/main/java/org/bukkit/craftbukkit/CraftCrashReport.java b/src/main/java/org/bukkit/craftbukkit/CraftCrashReport.java
index e08afce5..89983726 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftCrashReport.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftCrashReport.java
@@ -24,6 +24,7 @@ public class CraftCrashReport implements Callable<Object> {
                 value.append(' ').append(description.getFullName()).append(' ').append(description.getMain()).append(' ').append(Arrays.toString(description.getAuthors().toArray())).append(',');
             }
             value.append("}\n   Warnings: ").append(Bukkit.getWarningState().name());
+            value.append("\n   Reload Count: ").append(String.valueOf(MinecraftServer.getServer().server.reloadCount));
             value.append("\n   Threads: {");
             for (Map.Entry<Thread, ? extends Object[]> entry : Thread.getAllStackTraces().entrySet()) {
                 value.append(' ').append(entry.getKey().getState().name()).append(' ').append(entry.getKey().getName()).append(": ").append(Arrays.toString(entry.getValue())).append(',');
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index b4ad7d1e..1f936b04 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -161,6 +161,7 @@ public final class CraftServer implements Server {
     private final Pattern validUserPattern = Pattern.compile("^[a-zA-Z0-9_]{2,16}$");
     private final UUID invalidUserUUID = UUID.nameUUIDFromBytes("InvalidUsername".getBytes(Charsets.UTF_8));
     private final List<CraftPlayer> playerView;
+    public int reloadCount;
 
     private final class BooleanWrapper {
         private boolean value = true;
@@ -636,6 +637,7 @@ public final class CraftServer implements Server {
 
     @Override
     public void reload() {
+        reloadCount++;
         configuration = YamlConfiguration.loadConfiguration(getConfigFile());
         commandsConfiguration = YamlConfiguration.loadConfiguration(getCommandsConfigFile());
         PropertyManager config = new PropertyManager(console.options);
-- 
cgit v1.2.3