Update master to R2 as well.

Bukkit

@@ -1 +1 @@
-Subproject commit 92d0125e7f716d83b9165178e4e7eff8a7b426db
+Subproject commit b9846e5de470c50930477f2f51c07592e1fb7548

Bukkit-Patches/0001-POM-Changes.patch

@@ -1,11 +1,11 @@
-From 0147bd846abb4e7d73f400232fcda179a552a78e Mon Sep 17 00:00:00 2001
+From cae4b96d116f9c53871d20ac352c65cd8c73054f Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 10:36:24 +1000
 Subject: [PATCH] POM Changes
 
 
 diff --git a/pom.xml b/pom.xml
-index d1d18db..3dae8d4 100644
+index 1092756..805fbbb 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,43 +1,23 @@
@@ -23,7 +23,7 @@ index d1d18db..3dae8d4 100644
 +
 +    <groupId>org.spigotmc</groupId>
 +    <artifactId>spigot-api</artifactId>
-     <version>1.6.4-R1.1-SNAPSHOT</version>
+     <version>1.6.4-R2.1-SNAPSHOT</version>
 -    <name>Bukkit</name>
 -    <url>http://www.bukkit.org</url>
 +    <name>Spigot-API</name>

CraftBukkit

@@ -1 +1 @@
-Subproject commit e63ace2f25daa48c859b2585ebe0d479b316fa10
+Subproject commit 988f599494f4659053e0467e356e37c688f558ce

CraftBukkit-Patches/0001-POM-Changes.patch

@@ -1,11 +1,11 @@
-From d126a83bee19a7cad37ba569b9df9e4dc55f5f71 Mon Sep 17 00:00:00 2001
+From 1e30afdf5e51ea4aab45e4ddadaa8e38e4082682 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 2 Jul 2013 13:07:39 +1000
 Subject: [PATCH] POM Changes
 
 
 diff --git a/pom.xml b/pom.xml
-index 56b9e37..e165937 100644
+index b56b26c..de6eeed 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,12 +1,20 @@
@@ -25,7 +25,7 @@ index 56b9e37..e165937 100644
 +  <groupId>org.spigotmc</groupId>
 +  <artifactId>spigot</artifactId>
    <packaging>jar</packaging>
-   <version>1.6.4-R1.1-SNAPSHOT</version>
+   <version>1.6.4-R2.1-SNAPSHOT</version>
 -  <name>CraftBukkit</name>
 -  <url>http://www.bukkit.org</url>
 +  <name>Spigot</name>
@@ -142,7 +142,7 @@ index 56b9e37..e165937 100644
            <execution>
              <phase>package</phase>
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 85be77e..cee0549 100644
+index d140c4f..8fc8bba 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -210,7 +210,7 @@ public final class CraftServer implements Server {

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

@@ -1,4 +1,4 @@
-From 22a302760e6ebdc25898e5ef540b2f0a6c8c05a4 Mon Sep 17 00:00:00 2001
+From 5bc49050726a39ddfe0497a44127469e5c5ec403 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 62ecc19..06a4ef6 100644
+index 906ae33..b4c4f21 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 62ecc19..06a4ef6 100644
  import net.minecraft.server.ServerNBTManager;
  import net.minecraft.server.WorldLoaderServer;
  import net.minecraft.server.WorldManager;
-@@ -823,6 +825,30 @@ public final class CraftServer implements Server {
+@@ -822,6 +824,30 @@ public final class CraftServer implements Server {
          worlds.remove(world.getName().toLowerCase());
          console.worlds.remove(console.worlds.indexOf(handle));
  

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

@@ -1,4 +1,4 @@
-From 478d31c33b0dd712754a68077ebe0bffa294c882 Mon Sep 17 00:00:00 2001
+From 9ec77bb432ca9e73c89419d7198b7cb5976fce13 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 06a4ef6..a1fdc79 100644
+index b4c4f21..30239a7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1105,7 +1105,7 @@ public final class CraftServer implements Server {
+@@ -1104,7 +1104,7 @@ public final class CraftServer implements Server {
      }
  
      public OfflinePlayer getOfflinePlayer(String name) {

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

@@ -1,14 +1,14 @@
-From 7bf7fbec6b559c4418506b2694c2bcb1102105f2 Mon Sep 17 00:00:00 2001
+From eca50c612dffde50a1ed1d1aa14dd87335f8f7dd 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 a1fdc79..0d7b044 100644
+index 30239a7..b216aaf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1372,7 +1372,7 @@ public final class CraftServer implements Server {
+@@ -1371,7 +1371,7 @@ public final class CraftServer implements Server {
      public List<String> tabCompleteCommand(Player player, String message) {
          List<String> completions = null;
          try {