Upstream merge

CraftBukkit

@@ -1 +1 @@
-Subproject commit 3762cc269480697083ad9f6bbed99a0551f17979
+Subproject commit 46c2c64af59eddfab228031aad49e97850ecd073

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

@@ -1,14 +1,14 @@
-From ebcb0fc76e2b4cb6978aae5ca4d8adbb47212ca3 Mon Sep 17 00:00:00 2001
+From bec9ec4cdc1f74c2811c3a53d8ce1c6b845da231 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 7c5db94..4cb78fd 100644
+index 9abb380..2b6b9fb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1583,6 +1583,13 @@ public final class CraftServer implements Server {
+@@ -1591,6 +1591,13 @@ public final class CraftServer implements Server {
      }
  
      public List<String> tabCompleteCommand(Player player, String message) {

CraftBukkit-Patches/0125-Address-Serious-Issues-with-Offline-Players.patch

@@ -1,4 +1,4 @@
-From 10d02ec6f0dd8e565dfa87b6381031fcabe0ca69 Mon Sep 17 00:00:00 2001
+From 5662e336a6db545f6d610d85c3940d64e8385c70 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 12 Apr 2014 17:17:10 +1000
 Subject: [PATCH] Address Serious Issues with Offline Players
@@ -6,7 +6,7 @@ Subject: [PATCH] Address Serious Issues with Offline Players
 Such as name being entirely unresolved! This fixes the whitelist command and no doubt lots more.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-index bec4134..ecf0fa4 100644
+index d92f503..5cae703 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 @@ -48,6 +48,12 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
@@ -20,13 +20,13 @@ index bec4134..ecf0fa4 100644
 +        }
 +        // Spigot End
  
-         NBTTagCompound data = getBukkitData();
+         // This might not match lastKnownName but if not it should be more correct
- 
+         if (profile.getName() != null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2645c97..c3212ab 100644
+index 4920956..c30197b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1322,7 +1322,7 @@ public final class CraftServer implements Server {
+@@ -1330,7 +1330,7 @@ public final class CraftServer implements Server {
          if (result == null) {
              result = offlinePlayers.get(id);
              if (result == null) {
@@ -35,14 +35,6 @@ index 2645c97..c3212ab 100644
                  offlinePlayers.put(id, result);
              }
          } else {
-@@ -1392,6 +1392,7 @@ public final class CraftServer implements Server {
-     public Set<OfflinePlayer> getWhitelistedPlayers() {
-         Set<OfflinePlayer> result = new LinkedHashSet<OfflinePlayer>();
- 
-+        Object w = playerList.getWhitelisted();
-         for (Object name : playerList.getWhitelisted()) {
-             if (((String)name).length() == 0 || ((String)name).startsWith("#")) {
-                 continue;
 -- 
 1.8.3.2