*wipes sweat off brow, add /tps and /restart commands

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

@@ -1,4 +1,4 @@
-From 0f73824e729e0ec4ea129df7f583f6183600a79d Mon Sep 17 00:00:00 2001
+From 2a6d2a8feddce00e9d66e2b17088e84b54748fd7 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 6642e86..2b77e04 100644
+index 78a7573..1a13e18 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-@@ -60,4 +60,11 @@ public class SpigotWorldConfig
+@@ -65,4 +65,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 1dd2846a5baeca5b402c2ed8c154eb305670189d Mon Sep 17 00:00:00 2001
+From f7f5efd1e09e9ec6ff47206b21e2baff2aba71b0 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 2b77e04..fcc2c88 100644
+index 1a13e18..17b43c1 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-@@ -67,4 +67,36 @@ public class SpigotWorldConfig
+@@ -72,4 +72,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 7b5dea06abdd8821b9eae340a8168cfb47ef43d8 Mon Sep 17 00:00:00 2001
+From a26c2eedc264aed6e095e02b5db0e497e7efccee 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 bf297bc..342d883 100644
+index 933500d..cbd05af 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
-@@ -95,4 +95,10 @@ public class SpigotConfig
+@@ -110,4 +110,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 b7bcbfba58901386aae82eb079dafc7d2bb6f17f Mon Sep 17 00:00:00 2001
+From dc6b4cae56006f9b5cc4a041d832d0bc314e3c16 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 fcc2c88..58406e5 100644
+index 17b43c1..705ee2e 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-@@ -99,4 +99,18 @@ public class SpigotWorldConfig
+@@ -104,4 +104,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 ee35f397d1f01892ef579716909a6a61f8e55937 Mon Sep 17 00:00:00 2001
+From 054568f23c2021036cef88d2d9ff41f086dba1a1 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 58406e5..c56b3e0 100644
+index 705ee2e..d7e9794 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-@@ -113,4 +113,11 @@ public class SpigotWorldConfig
+@@ -118,4 +118,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 47772fc5f951855c7814afa967489d5ce454554a Mon Sep 17 00:00:00 2001
+From 6468eb8fe73a0cd8b584dac5bdce503608a035dd 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
@@ -116,6 +116,28 @@ index 0000000..f114a31
 +        return true;
 +    }
 +}
+diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
+index cbd05af..3bd93ad 100644
+--- a/src/main/java/org/spigotmc/SpigotConfig.java
++++ b/src/main/java/org/spigotmc/SpigotConfig.java
+@@ -14,6 +14,7 @@ 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
+ {
+@@ -116,4 +117,9 @@ public class SpigotConfig
+     {
+         preventProxies = getBoolean( "settings.prevent-proxies", false );
+     }
++
++    private void tpsCommand()
++    {
++        commands.put( "tps", new TicksPerSecondCommand( "tps" ) );
++    }
+ }
 -- 
 1.8.1.2
 

CraftBukkit-Patches/0019-Orebfuscator.patch

@@ -1,4 +1,4 @@
-From ce0f33c8af5d3b5fcb21e1dff0808d39c4b3b180 Mon Sep 17 00:00:00 2001
+From f9b52ad834a62522ab547a804d3039c43ed2a9f8 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..74ee741
 +    }
 +}
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index c56b3e0..5e1cfa9 100644
+index d7e9794..660c660 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 c56b3e0..5e1cfa9 100644
  import java.util.List;
  import org.bukkit.Bukkit;
  import org.bukkit.configuration.file.YamlConfiguration;
-@@ -120,4 +121,25 @@ public class SpigotWorldConfig
+@@ -125,4 +126,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 0ad89ba769c9c32aa1fe9b2174a80077cbf42ef1 Mon Sep 17 00:00:00 2001
+From 3e1f376bdd56f8214943d4cd50fec60d4afab2ee 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 eac85fc..6db43d8 100644
+index 660c660..81db826 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-@@ -142,4 +142,11 @@ public class SpigotWorldConfig
+@@ -147,4 +147,11 @@ public class SpigotWorldConfig
          
          antiXrayInstance = new AntiXray( this );
      }

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

@@ -1,4 +1,4 @@
-From 3e2225679ce7bb228ae9527d4cae18bc1523e92d Mon Sep 17 00:00:00 2001
+From e40f1e3ad3bb6f8ce6262dba58e92764f50dfb4b 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 6db43d8..494a94e 100644
+index 81db826..263bc15 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-@@ -149,4 +149,15 @@ public class SpigotWorldConfig
+@@ -154,4 +154,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 de751bfcb848c186b0d2899a659ad39404b4ef81 Mon Sep 17 00:00:00 2001
+From 0bc162abd73017c3eb6941612ef4e2669dcf65c5 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,18 +657,18 @@ 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 e84372d..8711c7a 100644
+index 3bd93ad..7825cfc 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
-@@ -30,6 +30,7 @@ public class SpigotConfig
-     static YamlConfiguration config;
+@@ -36,6 +36,7 @@ public class SpigotConfig
      static int version;
+     static Map<String, Command> commands;
      /*========================================================================*/
 +    private static Metrics metrics;
  
      public static void init()
      {
-@@ -39,6 +40,18 @@ public class SpigotConfig
+@@ -47,6 +48,18 @@ public class SpigotConfig
  
          version = getInt( "config-version", 1 );
          readConfig( SpigotConfig.class, null );
@@ -686,7 +686,7 @@ index e84372d..8711c7a 100644
 +        }
      }
  
-     static void readConfig(Class<?> clazz, Object instance)
+     public static void registerCommands(SimpleCommandMap commandMap)
 -- 
 1.8.1.2
 

CraftBukkit-Patches/0024-Watchdog-Thread.patch

@@ -1,4 +1,4 @@
-From 21f77e26c9c80277b474d950860e63a27b0fd8f1 Mon Sep 17 00:00:00 2001
+From 6b299bce7cd7b47541e5c780e09555b8e2fed3ff 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,12 +142,12 @@ index 0000000..a5c4549
 +    }
 +}
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index b5f3532..89b2927 100644
+index 7825cfc..af567ac 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
-@@ -114,4 +114,15 @@ public class SpigotConfig
+@@ -135,4 +135,16 @@ public class SpigotConfig
      {
-         preventProxies = getBoolean( "settings.prevent-proxies", false );
+         commands.put( "tps", new TicksPerSecondCommand( "tps" ) );
      }
 +
 +    public static int timeoutTime = 60;
@@ -158,6 +158,7 @@ index b5f3532..89b2927 100644
 +        timeoutTime = getInt( "settings.timeout-time", timeoutTime );
 +        restartOnCrash = getBoolean( "settings.restart-on-crash", restartOnCrash );
 +        restartScript = getString( "settings.restart-script", restartScript );
++        commands.put( "restart", new RestartCommand( "restart" ) );
 +        WatchdogThread.doStart( timeoutTime, restartOnCrash );
 +    }
  }

CraftBukkit-Patches/0025-Netty.patch

@@ -1,35 +1,8 @@
-From 3a9c5ddf9b383449f2de17e827cccf88fe430f7d Mon Sep 17 00:00:00 2001
+From 1de426d2cd4da44ab5a22aca56f2eceac874d2eb Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
-Date: Tue, 23 Apr 2013 11:47:32 +1000
+Date: Fri, 21 Jun 2013 18:23:00 +1000
 Subject: [PATCH] Netty
 
- Implement an uber efficient network engine based on the
- Java NIO framework Netty. This is basically a complete rewrite of the
- Minecraft network engine with many distinct advantages. First and foremost,
- there will no longer be the horrid, and redundant case of 2, or even at
- times, 3 threads per a connection. Instead low level select/epoll based NIO
- is used. The number of threads used for network reading and writing will
- scale automatically to the number of cores for use on your server. In most
- cases this will be around 8 threads for a 4 core server, much better than the
- up to 1000 threads that could be in use at one time with the old engine. To
- facilitate asynchronous packet sending or receiving (currently only chat), a
- thread pool of 16 threads is kept handy. == Plugin incompatibilities As a
- side effect of this change, plugins which rely on very specific
- implementation level details within Minecraft are broken. At this point in
- time, TagAPI and ProtocolLib are affected. If you are a user of ProtocolLib
- you are advised to update to the latest build, where full support is enabled.
- If you are a user of TagAPI, support has not yet been added, so you will need
- to install the updated ProtocolLib so that TagAPI may use its functions. ==
- Stability The code within this commit has been very lightly tested in
- production (300 players for approximately 24 hours), however it is not
- guaranteed to be free from all bugs. If you experence weird connection
- behaviour, reporting the bug and steps to reproduce are advised. You are also
- free to downgrade to the latest recommend build, which is guaranteed to be
- stable. == Summary This commit provides a reduction in threads, which gives
- the CPU / operating system more time to allocate to the main server threads,
- as well as various other side benefits such as chat thread pooling and a
- slight reduction in latency. This commit is licensed under the Creative
- Commons Attribution-ShareAlike 3.0 Unported license.
 
 diff --git a/pom.xml b/pom.xml
 index 8c9f66b..a33020e 100644
@@ -210,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 00326c1..c18e5e3 100644
+index 92c6c88..796085d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1366,4 +1366,20 @@ public final class CraftServer implements Server {
+@@ -1369,4 +1369,20 @@ public final class CraftServer implements Server {
      public CraftScoreboardManager getScoreboardManager() {
          return scoreboardManager;
      }
@@ -377,23 +350,20 @@ index 0000000..386c2f8
 +    }
 +}
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 6e8bae8..5686c41 100644
+index af567ac..8d59e39 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
-@@ -6,7 +6,11 @@ import java.io.IOException;
+@@ -6,6 +6,8 @@ import java.io.IOException;
  import java.lang.reflect.InvocationTargetException;
  import java.lang.reflect.Method;
  import java.lang.reflect.Modifier;
 +import java.util.ArrayList;
 +import java.util.Collections;
-+import java.util.HashMap;
+ import java.util.HashMap;
  import java.util.List;
-+import java.util.Map;
- import java.util.logging.Level;
- import org.bukkit.Bukkit;
- import org.bukkit.configuration.file.YamlConfiguration;
-@@ -125,4 +129,44 @@ public class SpigotConfig
-         restartScript = getString( "settings.restart-script", restartScript );
+ import java.util.Map;
+@@ -147,4 +149,44 @@ public class SpigotConfig
+         commands.put( "restart", new RestartCommand( "restart" ) );
          WatchdogThread.doStart( timeoutTime, restartOnCrash );
      }
 +
@@ -1570,20 +1540,6 @@ index 0000000..d3a9cab
 +     */
 +    DATA;
 +}
-diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml
-index 61a95e3..e65758d 100644
---- a/src/main/resources/configurations/bukkit.yml
-+++ b/src/main/resources/configurations/bukkit.yml
-@@ -13,6 +13,9 @@
- # Bug tracker: http://leaky.bukkit.org/
- 
- 
-+#listeners:
-+#  - address: 127.0.0.1
-+#    port: 25577
- settings:
-     allow-end: true
-     warn-on-overload: true
 -- 
 1.8.1.2
 

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

@@ -1,4 +1,4 @@
-From 909c3ed4c89b1a12496686b431ba74c1deb28c9c Mon Sep 17 00:00:00 2001
+From aa295927ecd733806da255f2e88f48d8b66e3cdd 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 c567250..de052ad 100644
+index 263bc15..c7ccbce 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-@@ -160,4 +160,19 @@ public class SpigotWorldConfig
+@@ -165,4 +165,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 c2e3bc388c9aa440a90d0fff23131900c434a23c Mon Sep 17 00:00:00 2001
+From 1b2363993453160576da3b0ec93eeb951a30e3bb 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 5686c41..952c0ab 100644
+index 8d59e39..d882808 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 5686c41..952c0ab 100644
  import java.util.Collections;
  import java.util.HashMap;
  import java.util.List;
-@@ -169,4 +170,14 @@ public class SpigotConfig
+@@ -189,4 +190,14 @@ public class SpigotConfig
              this.listeners.add( new Listener( host, port, netty, connectionThrottle ) );
          }
      }

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

@@ -1,4 +1,4 @@
-From 18510e40ca616147f8f9cd5baee7554071122eb9 Mon Sep 17 00:00:00 2001
+From f812ee46c14a5b41054d533ee5727427e75d9a93 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 c18e5e3..b32f6f1 100644
+index 796085d..8746776 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 c18e5e3..b32f6f1 100644
  import net.minecraft.server.ServerNBTManager;
  import net.minecraft.server.WorldLoaderServer;
  import net.minecraft.server.WorldManager;
-@@ -808,6 +810,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 4a2de4a9743e9e7b558366b8128dae5fd4cb3e0d Mon Sep 17 00:00:00 2001
+From 5f0677ff55d769c9cc1b2db56fe190f422c71b8b 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 87d3b6e..0a30d4c 100644
+index c7ccbce..da5f510 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-@@ -175,4 +175,13 @@ public class SpigotWorldConfig
+@@ -180,4 +180,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 86654f9d64ccc6fbefc3b5f7da9fa28b9d43563f Mon Sep 17 00:00:00 2001
+From 834d61d921f90d20f1d92e7ae5768b2c089996df 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 b32f6f1..8990b9f 100644
+index 8746776..be832ac 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1085,7 +1085,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 1911a4552a07b000e685b8c604a9759f130bec1f Mon Sep 17 00:00:00 2001
+From 8ca478a5293b028b7bbec22ffc24b4465661b5a2 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 a7a9625..2e9341b 100644
+index d882808..3918325 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
-@@ -180,4 +180,13 @@ public class SpigotConfig
+@@ -200,4 +200,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 b67a84c4c41e1a1e5cf4b70f70d67625ed5c869c Mon Sep 17 00:00:00 2001
+From 34058c02181ad2cf992b6fc702b80d6d47a9ed26 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 2e9341b..b283c7d 100644
+index 3918325..1329712 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
-@@ -189,4 +189,10 @@ public class SpigotConfig
+@@ -209,4 +209,10 @@ public class SpigotConfig
              "/skill"
          } ) );
      }

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

@@ -1,14 +1,14 @@
-From 958e2c8da37c37b1aab8a7875c609ee878e28bcf Mon Sep 17 00:00:00 2001
+From 0a5f04dd779fd13b8ba468eb224b0a3a44596ecf 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 8990b9f..f41d740 100644
+index be832ac..3fa8dbe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1352,7 +1352,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 8990b9f..f41d740 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 b283c7d..56012e1 100644
+index 1329712..55f11a0 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
-@@ -195,4 +195,10 @@ public class SpigotConfig
+@@ -215,4 +215,10 @@ public class SpigotConfig
      {
          logCommands = getBoolean( "commands.log", true );
      }