Properly re-register commands on reload

CraftBukkit-Patches/0004-Spigot-Configuration.patch

@@ -1,25 +1,26 @@
-From 6d02dec6b5b43138083f33d639e9769a6b4c54d0 Mon Sep 17 00:00:00 2001
+From 30196d52fe8630bfa0dd6ccf218e2a0461310fc8 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
-Date: Fri, 21 Jun 2013 19:06:58 +1000
+Date: Sat, 22 Jun 2013 14:06:41 +1000
 Subject: [PATCH] Spigot Configuration
 
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 7261dc9..2d638c0 100644
+index 7261dc9..59444cb 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
-@@ -89,6 +89,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -89,6 +89,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
          if (this.G() < 0) {
              this.setPort(this.propertyManager.getInt("server-port", 25565));
          }
 +        // Spigot start
 +        this.a((PlayerList) (new DedicatedPlayerList(this)));
 +        org.spigotmc.SpigotConfig.init();
++        org.spigotmc.SpigotConfig.registerCommands();
 +        // Spigot end
  
          this.getLogger().info("Generating keypair");
          this.a(MinecraftEncryption.b());
-@@ -103,7 +107,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -103,7 +108,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
              return false;
          }
  
@@ -49,18 +50,10 @@ index 3a4ddea..de052bd 100644
          this.world = new CraftWorld((WorldServer) this, gen, env);
          this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 00326c1..24f1f39 100644
+index 00326c1..6e6fe1c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -213,7 +213,6 @@ public final class CraftServer implements Server {
-         updater.getOnBroken().addAll(configuration.getStringList("auto-updater.on-broken"));
-         updater.getOnUpdate().addAll(configuration.getStringList("auto-updater.on-update"));
-         updater.check(serverVersion);
--
-         loadPlugins();
-         enablePlugins(PluginLoadOrder.STARTUP);
-     }
-@@ -556,6 +555,7 @@ public final class CraftServer implements Server {
+@@ -556,6 +556,7 @@ public final class CraftServer implements Server {
          playerList.getIPBans().load();
          playerList.getNameBans().load();
  
@@ -68,7 +61,7 @@ index 00326c1..24f1f39 100644
          for (WorldServer world : console.worlds) {
              world.difficulty = difficulty;
              world.setSpawnFlags(monsters, animals);
-@@ -570,6 +570,7 @@ public final class CraftServer implements Server {
+@@ -570,11 +571,13 @@ public final class CraftServer implements Server {
              } else {
                  world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns();
              }
@@ -76,12 +69,18 @@ index 00326c1..24f1f39 100644
          }
  
          pluginManager.clearPlugins();
+         commandMap.clearCommands();
+         resetRecipes();
++        org.spigotmc.SpigotConfig.registerCommands(); // Spigot
+ 
+         int pollCount = 0;
+ 
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
 new file mode 100644
-index 0000000..c6cf18e
+index 0000000..1d915fb
 --- /dev/null
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
-@@ -0,0 +1,112 @@
+@@ -0,0 +1,114 @@
 +package org.spigotmc;
 +
 +import com.google.common.base.Throwables;
@@ -97,7 +96,6 @@ index 0000000..c6cf18e
 +import net.minecraft.server.MinecraftServer;
 +import org.bukkit.Bukkit;
 +import org.bukkit.command.Command;
-+import org.bukkit.command.SimpleCommandMap;
 +import org.bukkit.configuration.file.YamlConfiguration;
 +
 +public class SpigotConfig
@@ -131,7 +129,10 @@ index 0000000..c6cf18e
 +
 +        version = getInt( "config-version", 1 );
 +        readConfig( SpigotConfig.class, null );
++    }
 +
++    public static void registerCommands()
++    {
 +        for ( Map.Entry<String, Command> entry : commands.entrySet() )
 +        {
 +            MinecraftServer.getServer().server.getCommandMap().register( entry.getKey(), "Spigot", entry.getValue() );
@@ -196,10 +197,10 @@ index 0000000..c6cf18e
 +}
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 new file mode 100644
-index 0000000..78a7573
+index 0000000..3f8562f
 --- /dev/null
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-@@ -0,0 +1,68 @@
+@@ -0,0 +1,66 @@
 +package org.spigotmc;
 +
 +import java.util.List;
@@ -224,10 +225,8 @@ index 0000000..78a7573
 +    {
 +        this.verbose = getBoolean( "verbose", true );
 +
-+        log( "-------------- Spigot ----------------" );
 +        log( "-------- World Settings For [" + worldName + "] --------" );
 +        SpigotConfig.readConfig( SpigotWorldConfig.class, this );
-+        log( "-------------------------------------------------" );
 +    }
 +
 +    private void log(String s)

CraftBukkit-Patches/0005-Better-Chunk-Tick-Selection.patch

@@ -1,4 +1,4 @@
-From 2a6d2a8feddce00e9d66e2b17088e84b54748fd7 Mon Sep 17 00:00:00 2001
+From a4f3a529237119d805302947bd76ddb384bd9379 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 11 Jun 2013 12:56:02 +1000
 Subject: [PATCH] Better Chunk Tick Selection
@@ -148,10 +148,10 @@ index 49360c1..6c3fcf1 100644
                          }
                      }
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 78a7573..1a13e18 100644
+index 3f8562f..123fb7a 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-@@ -65,4 +65,11 @@ public class SpigotWorldConfig
+@@ -63,4 +63,11 @@ public class SpigotWorldConfig
          config.addDefault( "world-settings.default." + path, def );
          return config.getString( "world-settings." + worldName + "." + path, config.getString( "world-settings.default." + path ) );
      }

CraftBukkit-Patches/0006-Crop-Growth-Rates.patch

@@ -1,4 +1,4 @@
-From f7f5efd1e09e9ec6ff47206b21e2baff2aba71b0 Mon Sep 17 00:00:00 2001
+From e1460ee5d26b7d86cf40f75297367ac293712e1b Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 17:17:20 +1000
 Subject: [PATCH] Crop Growth Rates
@@ -132,10 +132,10 @@ index 8339a35..c7e2344 100644
  
                  if (l < 7) {
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 1a13e18..17b43c1 100644
+index 123fb7a..a929766 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-@@ -72,4 +72,36 @@ public class SpigotWorldConfig
+@@ -70,4 +70,36 @@ public class SpigotWorldConfig
          chunksPerTick = getInt( "chunks-per-tick", 650 );
          log( "Chunks to Grow per Tick: " + chunksPerTick );
      }

CraftBukkit-Patches/0009-Proxy-IP-Filter.patch

@@ -1,4 +1,4 @@
-From 3bb4fed2ec0758923220bcf21388d9f1a9f25377 Mon Sep 17 00:00:00 2001
+From 6c8715e0ffd4ce12e51b1505bab0af4908744c2e Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 23 Apr 2013 11:22:07 +1000
 Subject: [PATCH] Proxy IP Filter
@@ -67,10 +67,10 @@ index 0000000..55d8d12
 +    }
 +}
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 0b81a86..b4656d4 100644
+index 1d915fb..56ac067 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
-@@ -109,4 +109,10 @@ public class SpigotConfig
+@@ -111,4 +111,10 @@ public class SpigotConfig
          config.addDefault( path, def );
          return config.getString( path, config.getString( path ) );
      }

CraftBukkit-Patches/0010-Merge-tweaks-and-configuration.patch

@@ -1,4 +1,4 @@
-From dc6b4cae56006f9b5cc4a041d832d0bc314e3c16 Mon Sep 17 00:00:00 2001
+From dcf6e48a2c498079f9c10f19242ee3a8869101d7 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Mar 2013 09:46:33 +1100
 Subject: [PATCH] Merge tweaks and configuration
@@ -69,10 +69,10 @@ index afe3e4d..97da2cd 100644
          if (event != null && (event.isCancelled() || entity.dead)) {
              entity.dead = true;
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 17b43c1..705ee2e 100644
+index a929766..ea7c211 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-@@ -104,4 +104,18 @@ public class SpigotWorldConfig
+@@ -102,4 +102,18 @@ public class SpigotWorldConfig
          wheatModifier = getInt( "growth.wheat-modifier", 100 );
          log( "Cactus Growth Modifier: " + cactusModifier + "%" );
      }

CraftBukkit-Patches/0013-View-Distance.patch

@@ -1,4 +1,4 @@
-From 054568f23c2021036cef88d2d9ff41f086dba1a1 Mon Sep 17 00:00:00 2001
+From 25fa2cfa4437bbbe2eb832d7ec12070d8842a087 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Mar 2013 09:52:41 +1100
 Subject: [PATCH] View Distance
@@ -32,10 +32,10 @@ index 6c3fcf1..614a17f 100644
              this.entitiesById = new IntHashMap();
          }
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 705ee2e..d7e9794 100644
+index ea7c211..81879e6 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-@@ -118,4 +118,11 @@ public class SpigotWorldConfig
+@@ -116,4 +116,11 @@ public class SpigotWorldConfig
          expMerge = getDouble("merge-radius.exp", 3.0 );
          log( "Experience Merge Radius: " + expMerge );
      }

CraftBukkit-Patches/0017-Highly-Optimized-Tick-Loop.patch

@@ -1,4 +1,4 @@
-From 04e51665bd1ac94510c2eb76ef995bfb2dd40e05 Mon Sep 17 00:00:00 2001
+From ac8a1f6656ae9cd13e08c9e25b379769c9a6c7ae Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 3 Feb 2013 12:28:17 +1100
 Subject: [PATCH] Highly Optimized Tick Loop
@@ -117,18 +117,18 @@ index 0000000..f114a31
 +    }
 +}
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index b4656d4..66bf600 100644
+index 56ac067..d22e8e5 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
-@@ -15,6 +15,7 @@ import org.bukkit.Bukkit;
+@@ -14,6 +14,7 @@ import net.minecraft.server.MinecraftServer;
+ import org.bukkit.Bukkit;
  import org.bukkit.command.Command;
- import org.bukkit.command.SimpleCommandMap;
  import org.bukkit.configuration.file.YamlConfiguration;
 +import org.bukkit.craftbukkit.command.TicksPerSecondCommand;
  
  public class SpigotConfig
  {
-@@ -115,4 +116,9 @@ public class SpigotConfig
+@@ -117,4 +118,9 @@ public class SpigotConfig
      {
          preventProxies = getBoolean( "settings.prevent-proxies", false );
      }

CraftBukkit-Patches/0019-Orebfuscator.patch

@@ -1,4 +1,4 @@
-From 8a73fd5e8b75b6438a2cc7fbcd6d69c69b1f7264 Mon Sep 17 00:00:00 2001
+From 90de56da643bde4b842cc958a4b449634bb9ba8c Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 16 May 2013 18:51:05 +1000
 Subject: [PATCH] Orebfuscator
@@ -316,7 +316,7 @@ index 0000000..c29b789
 +    }
 +}
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index d7e9794..3525e9b 100644
+index 81879e6..0a304e8 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -1,5 +1,6 @@
@@ -326,7 +326,7 @@ index d7e9794..3525e9b 100644
  import java.util.List;
  import org.bukkit.Bukkit;
  import org.bukkit.configuration.file.YamlConfiguration;
-@@ -125,4 +126,25 @@ public class SpigotWorldConfig
+@@ -123,4 +124,25 @@ public class SpigotWorldConfig
          viewDistance = getInt( "view-distance", Bukkit.getViewDistance() );
          log( "View Distance: " + viewDistance );
      }

CraftBukkit-Patches/0020-Fix-Mob-Spawning-Relative-to-View-Distance.patch

@@ -1,4 +1,4 @@
-From 3e1f376bdd56f8214943d4cd50fec60d4afab2ee Mon Sep 17 00:00:00 2001
+From d1a43b7d46685cdaa095ef806f9300db709c5d84 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 17:29:54 +1000
 Subject: [PATCH] Fix Mob Spawning Relative to View Distance
@@ -121,10 +121,10 @@ index 056100f..bec0d91 100644
                                                                      continue label110;
                                                                  }
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 660c660..81db826 100644
+index 0a304e8..6c2a430 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-@@ -147,4 +147,11 @@ public class SpigotWorldConfig
+@@ -145,4 +145,11 @@ public class SpigotWorldConfig
          
          antiXrayInstance = new AntiXray( this );
      }

CraftBukkit-Patches/0022-Entity-Activation-Range.patch

@@ -1,4 +1,4 @@
-From e40f1e3ad3bb6f8ce6262dba58e92764f50dfb4b Mon Sep 17 00:00:00 2001
+From df64c572448edbe8dcefa1eeaaccc7a389f626f7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 Feb 2013 05:10:21 -0500
 Subject: [PATCH] Entity Activation Range
@@ -462,10 +462,10 @@ index 0000000..93ce20e
 +    }
 +}
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 81db826..263bc15 100644
+index 6c2a430..8b2c1d7 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-@@ -154,4 +154,15 @@ public class SpigotWorldConfig
+@@ -152,4 +152,15 @@ public class SpigotWorldConfig
          mobSpawnRange = (byte) getInt( "mob-spawn-range", 4 );
          log( "Mob Spawn Range: " + mobSpawnRange );
      }

CraftBukkit-Patches/0023-Metrics.patch

@@ -1,4 +1,4 @@
-From 6df166564cdcd609c552fe0b217d9671e10be660 Mon Sep 17 00:00:00 2001
+From a32d38cde53297cbbb1b3f674ccf493d22778ba5 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Feb 2013 08:58:35 +1100
 Subject: [PATCH] Metrics
@@ -657,10 +657,10 @@ index 0000000..f1690a2
 +}
 \ No newline at end of file
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 5ebb19a..9459195 100644
+index d22e8e5..8f53ca9 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
-@@ -37,6 +37,7 @@ public class SpigotConfig
+@@ -36,6 +36,7 @@ public class SpigotConfig
      static int version;
      static Map<String, Command> commands;
      /*========================================================================*/
@@ -668,7 +668,7 @@ index 5ebb19a..9459195 100644
  
      public static void init()
      {
-@@ -53,6 +54,18 @@ public class SpigotConfig
+@@ -55,6 +56,18 @@ public class SpigotConfig
          {
              MinecraftServer.getServer().server.getCommandMap().register( entry.getKey(), "Spigot", entry.getValue() );
          }

CraftBukkit-Patches/0024-Watchdog-Thread.patch

@@ -1,4 +1,4 @@
-From 62cef831a76dbfe52e85f86902931b43a6fd50a3 Mon Sep 17 00:00:00 2001
+From 3c8f2ccaa98803166178f16290fce2b8626e6ebb Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Feb 2013 12:33:20 +1100
 Subject: [PATCH] Watchdog Thread.
@@ -142,10 +142,10 @@ index 0000000..a5c4549
 +    }
 +}
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index fdab366..32140d1 100644
+index 8f53ca9..b7f3896 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
-@@ -134,4 +134,16 @@ public class SpigotConfig
+@@ -136,4 +136,16 @@ public class SpigotConfig
      {
          commands.put( "tps", new TicksPerSecondCommand( "tps" ) );
      }

CraftBukkit-Patches/0025-Netty.patch

@@ -1,4 +1,4 @@
-From ad431c66fd54963754e01d91185c0741474bdfe6 Mon Sep 17 00:00:00 2001
+From 33f4ba2034fd8cd22a8b9da2115c25000154c038 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 18:23:00 +1000
 Subject: [PATCH] Netty
@@ -26,10 +26,10 @@ index 8c9f66b..a33020e 100644
  
    <!-- This builds a completely 'ready to start' jar with all dependencies inside -->
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 2d638c0..7675076 100644
+index 59444cb..e101f95 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
-@@ -99,7 +99,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -100,7 +100,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
          this.getLogger().info("Starting Minecraft server on " + (this.getServerIp().length() == 0 ? "*" : this.getServerIp()) + ":" + this.G());
  
          try {
@@ -183,10 +183,10 @@ index 17cfacc..a945892 100644
              this.b = true;
          } catch (Exception exception) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 24f1f39..07bcb29 100644
+index 6e6fe1c..68694de 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1367,4 +1367,20 @@ public final class CraftServer implements Server {
+@@ -1369,4 +1369,20 @@ public final class CraftServer implements Server {
      public CraftScoreboardManager getScoreboardManager() {
          return scoreboardManager;
      }
@@ -350,7 +350,7 @@ index 0000000..386c2f8
 +    }
 +}
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 32140d1..e762527 100644
+index b7f3896..606b01e 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -6,6 +6,8 @@ import java.io.IOException;
@@ -362,7 +362,7 @@ index 32140d1..e762527 100644
  import java.util.HashMap;
  import java.util.List;
  import java.util.Map;
-@@ -146,4 +148,44 @@ public class SpigotConfig
+@@ -148,4 +150,44 @@ public class SpigotConfig
          commands.put( "restart", new RestartCommand( "restart" ) );
          WatchdogThread.doStart( timeoutTime, restartOnCrash );
      }

CraftBukkit-Patches/0029-Entity-Tracking-Ranges.patch

@@ -1,4 +1,4 @@
-From aa295927ecd733806da255f2e88f48d8b66e3cdd Mon Sep 17 00:00:00 2001
+From 17fbd3f0e6586b3b59b8bbd9f4327e4a09512b24 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 20 Feb 2013 11:58:47 -0500
 Subject: [PATCH] Entity Tracking Ranges
@@ -24,10 +24,10 @@ index d7efe3e..59586c2 100644
              i = this.d;
          }
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 263bc15..c7ccbce 100644
+index 8b2c1d7..89d716c 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-@@ -165,4 +165,19 @@ public class SpigotWorldConfig
+@@ -163,4 +163,19 @@ public class SpigotWorldConfig
          miscActivationRange = getInt( "entity-activation-range.misc", miscActivationRange );
          log( "Entity Activation Range: An " + animalActivationRange + " / Mo " + monsterActivationRange + " / Mi " + miscActivationRange );
      }

CraftBukkit-Patches/0030-BungeeCord-Support.patch

@@ -1,4 +1,4 @@
-From eae71452b63e57a58eff69db1b7d444bd5829120 Mon Sep 17 00:00:00 2001
+From 2aec923f52118621b312e361b2a38b3b92c185c2 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Mar 2013 11:15:11 +1100
 Subject: [PATCH] BungeeCord Support
@@ -75,7 +75,7 @@ index 7cae665..21141f2 100644
  
      public Spigot spigot()
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index e762527..6234dca 100644
+index 606b01e..042241c 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -7,6 +7,7 @@ import java.lang.reflect.InvocationTargetException;
@@ -86,7 +86,7 @@ index e762527..6234dca 100644
  import java.util.Collections;
  import java.util.HashMap;
  import java.util.List;
-@@ -188,4 +189,14 @@ public class SpigotConfig
+@@ -190,4 +191,14 @@ public class SpigotConfig
              listeners.add( new Listener( host, port, netty, connectionThrottle ) );
          }
      }

CraftBukkit-Patches/0035-Close-Unloaded-Save-Files.patch

@@ -1,4 +1,4 @@
-From aefb985765b649229b3fd02cf32a44398bc69465 Mon Sep 17 00:00:00 2001
+From 84f08c5d634c68048f6621cdd42344ce0bc8a9ea Mon Sep 17 00:00:00 2001
 From: Antony Riley <antony@cyberiantiger.org>
 Date: Wed, 27 Mar 2013 01:41:54 +0200
 Subject: [PATCH] Close Unloaded Save Files
@@ -18,7 +18,7 @@ index 900ed68..829f4a3 100644
      public static synchronized RegionFile a(File file1, int i, int j) {
          File file2 = new File(file1, "region");
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 07bcb29..c5a8068 100644
+index 68694de..2cca80a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -37,6 +37,8 @@ import net.minecraft.server.MinecraftServer;
@@ -30,7 +30,7 @@ index 07bcb29..c5a8068 100644
  import net.minecraft.server.ServerNBTManager;
  import net.minecraft.server.WorldLoaderServer;
  import net.minecraft.server.WorldManager;
-@@ -809,6 +811,30 @@ public final class CraftServer implements Server {
+@@ -811,6 +813,30 @@ public final class CraftServer implements Server {
          worlds.remove(world.getName().toLowerCase());
          console.worlds.remove(console.worlds.indexOf(handle));
  

CraftBukkit-Patches/0044-Hopper-Cooldowns.patch

@@ -1,4 +1,4 @@
-From 5f0677ff55d769c9cc1b2db56fe190f422c71b8b Mon Sep 17 00:00:00 2001
+From 2a158ef53f85cf5004c22e680bfe80dcd1f4f573 Mon Sep 17 00:00:00 2001
 From: DerFlash <bte@freenet.de>
 Date: Sun, 2 Jun 2013 16:23:46 +1000
 Subject: [PATCH] Hopper Cooldowns
@@ -64,10 +64,10 @@ index f6d269d..1f69c7b 100644
  
                  iinventory.update();
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index c7ccbce..da5f510 100644
+index 89d716c..8f13fa9 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-@@ -180,4 +180,13 @@ public class SpigotWorldConfig
+@@ -178,4 +178,13 @@ public class SpigotWorldConfig
          maxTrackingRange = getInt( "entity-tracking-range.other", maxTrackingRange );
          log( "Entity Tracking Range: Pl " + playerTrackingRange + " / An " + animalTrackingRange + " / Mo " + monsterTrackingRange + " / Mi " + miscTrackingRange + " / Other " + maxTrackingRange );
      }

CraftBukkit-Patches/0048-Do-Not-Search-for-Offline-Players.patch

@@ -1,4 +1,4 @@
-From 14ab621466bc84c046515970a2f5cfcac7b10f54 Mon Sep 17 00:00:00 2001
+From 4822e71bfb0e5730738fd2a06a4bf3ff33e75c28 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 16 Jun 2013 08:20:26 +1000
 Subject: [PATCH] Do Not Search for Offline Players
@@ -6,10 +6,10 @@ Subject: [PATCH] Do Not Search for Offline Players
 By default we do not want to search as this leads to massive load times for plugins wanting to do mass data lookups.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c5a8068..7534188 100644
+index 2cca80a..1fcbd33 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1086,7 +1086,7 @@ public final class CraftServer implements Server {
+@@ -1088,7 +1088,7 @@ public final class CraftServer implements Server {
      }
  
      public OfflinePlayer getOfflinePlayer(String name) {

CraftBukkit-Patches/0050-Spam-Filter-Exclusions.patch

@@ -1,4 +1,4 @@
-From 7dbc12290307517690e119452320858103500a7f Mon Sep 17 00:00:00 2001
+From 157f91f16c4c3e8bf3fb86756b9da2a9c5e4c7fd Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 17:59:22 +1000
 Subject: [PATCH] Spam Filter Exclusions
@@ -19,10 +19,10 @@ index 998ac8d..a292c1a 100644
                          Waitable waitable = new Waitable() {
                              @Override
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 6234dca..3c32b08 100644
+index 042241c..d2d7ffc 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
-@@ -199,4 +199,13 @@ public class SpigotConfig
+@@ -201,4 +201,13 @@ public class SpigotConfig
          bungeeAddresses = getList( "settings.bungeecord-addresses", bungee );
          bungee = getBoolean( "settings.bungeecord", true );
      }

CraftBukkit-Patches/0051-Allow-Disabling-of-Command-Logging.patch

@@ -1,4 +1,4 @@
-From 36f3fc0a1175cf0b6dc14b0253de6ed6eb67fd58 Mon Sep 17 00:00:00 2001
+From c2e12f59e2d9d0ca80738e24565da4043c333413 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 18:01:29 +1000
 Subject: [PATCH] Allow Disabling of Command Logging
@@ -23,10 +23,10 @@ index a292c1a..0e8d292 100644
                  org.bukkit.craftbukkit.SpigotTimings.playerCommandTimer.stopTiming(); // Spigot
                  return;
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 3c32b08..e15bf25 100644
+index d2d7ffc..c7de211 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
-@@ -208,4 +208,10 @@ public class SpigotConfig
+@@ -210,4 +210,10 @@ public class SpigotConfig
              "/skill"
          } ) );
      }

CraftBukkit-Patches/0052-Allow-Disabling-of-Command-TabComplete.patch

@@ -1,14 +1,14 @@
-From 61994fd6edb1fc608e913d2008fb7ec602c3056e Mon Sep 17 00:00:00 2001
+From c92028eb307ed2d2a654b54df8e3e0123352864f Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 18:05:54 +1000
 Subject: [PATCH] Allow Disabling of Command TabComplete
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7534188..4d030b0 100644
+index 1fcbd33..42600a6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1353,7 +1353,7 @@ public final class CraftServer implements Server {
+@@ -1355,7 +1355,7 @@ public final class CraftServer implements Server {
      public List<String> tabCompleteCommand(Player player, String message) {
          List<String> completions = null;
          try {
@@ -18,10 +18,10 @@ index 7534188..4d030b0 100644
              player.sendMessage(ChatColor.RED + "An internal error occurred while attempting to tab-complete this command");
              getLogger().log(Level.SEVERE, "Exception when " + player.getName() + " attempted to tab complete " + message, ex);
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index e15bf25..8ac5e41 100644
+index c7de211..4b18e72 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
-@@ -214,4 +214,10 @@ public class SpigotConfig
+@@ -216,4 +216,10 @@ public class SpigotConfig
      {
          logCommands = getBoolean( "commands.log", true );
      }

CraftBukkit-Patches/0053-Configurable-Messages.patch

@@ -1,4 +1,4 @@
-From 6484c43dc5b08c4317b478c9e86d03c3bb2b43c9 Mon Sep 17 00:00:00 2001
+From 26b56fde0ad7602876b78a4f22e034936899a957 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 19:21:58 +1000
 Subject: [PATCH] Configurable Messages
@@ -18,10 +18,10 @@ index fe846af..edeefba 100644
              String s2 = socketaddress.toString();
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4d030b0..71ce507 100644
+index 42600a6..9d71ae3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -525,7 +525,7 @@ public final class CraftServer implements Server {
+@@ -526,7 +526,7 @@ public final class CraftServer implements Server {
              return true;
          }
  
@@ -31,7 +31,7 @@ index 4d030b0..71ce507 100644
          return false;
      }
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index e91f364..992b9c7 100644
+index 4b18e72..147e407 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -15,6 +15,7 @@ import java.util.Map;
@@ -40,9 +40,9 @@ index e91f364..992b9c7 100644
  import org.bukkit.Bukkit;
 +import org.bukkit.ChatColor;
  import org.bukkit.command.Command;
- import org.bukkit.command.SimpleCommandMap;
  import org.bukkit.configuration.file.YamlConfiguration;
-@@ -220,4 +221,16 @@ public class SpigotConfig
+ import org.bukkit.craftbukkit.command.TicksPerSecondCommand;
+@@ -222,4 +223,16 @@ public class SpigotConfig
      {
          tabComplete = getBoolean( "commands.tab-complete", true );
      }