Upstream: Add more expansive UUID based operations

Bukkit

@@ -1 +1 @@
-Subproject commit 55c8f0a007ff851787dc8672a53763f6039d4cac
+Subproject commit 4bc86be459a7ce310f523ca03e2908c1d29956f4

CraftBukkit

@@ -1 +1 @@
-Subproject commit 8e87ff5794bb9a5ca1a1a074fab62e0726b81655
+Subproject commit cf5a547b996b18361a9eed290cdbbf0fdb03b096

CraftBukkit-Patches/0001-POM-Changes.patch

@@ -1,4 +1,4 @@
-From 4448339ef7ba6e331100c7f58a95e427f14f32ef Mon Sep 17 00:00:00 2001
+From ed66642c321aa6ad8376ccafed67c0da3d4ae331 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
@@ -142,10 +142,10 @@ index 9f81af0..c8285e0 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 04f8a69..7aedef4 100644
+index 2b5aa31..9c81339 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -304,7 +304,7 @@ public final class CraftServer implements Server {
+@@ -303,7 +303,7 @@ public final class CraftServer implements Server {
          loadIcon();
  
          updater = new AutoUpdater(new BukkitDLUpdaterService(configuration.getString("auto-updater.host")), getLogger(), configuration.getString("auto-updater.preferred-channel"));
@@ -168,5 +168,5 @@ index f905d17..9304637 100644
  
          if (stream != null) {
 -- 
-1.8.5.2.msysgit.0
+1.8.3.2
 

CraftBukkit-Patches/0004-Spigot-Configuration.patch

@@ -1,4 +1,4 @@
-From 3424b3f7065054cdd942eb6ad56d86eab89e672a Mon Sep 17 00:00:00 2001
+From dc945bb032e60d81ba93c5bd07b473fd282ec312 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 7 Jul 2013 09:32:53 +1000
 Subject: [PATCH] Spigot Configuration
@@ -54,10 +54,10 @@ index 2f514b5..96a3eb8 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 7aedef4..50a27fb 100644
+index 9c81339..aa76abe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -310,8 +310,10 @@ public final class CraftServer implements Server {
+@@ -309,8 +309,10 @@ public final class CraftServer implements Server {
          updater.getOnUpdate().addAll(configuration.getStringList("auto-updater.on-update"));
          updater.check(serverVersion);
  
@@ -70,7 +70,7 @@ index 7aedef4..50a27fb 100644
      }
  
      public boolean getCommandBlockOverride(String command) {
-@@ -726,6 +728,7 @@ public final class CraftServer implements Server {
+@@ -736,6 +738,7 @@ public final class CraftServer implements Server {
          playerList.getIPBans().load();
          playerList.getNameBans().load();
  
@@ -78,7 +78,7 @@ index 7aedef4..50a27fb 100644
          for (WorldServer world : console.worlds) {
              world.difficulty = difficulty;
              world.setSpawnFlags(monsters, animals);
-@@ -740,11 +743,14 @@ public final class CraftServer implements Server {
+@@ -750,11 +753,14 @@ public final class CraftServer implements Server {
              } else {
                  world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns();
              }
@@ -297,5 +297,5 @@ index 0000000..961ddb4
 +    }
 +}
 -- 
-1.8.5.2.msysgit.0
+1.8.3.2
 

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

@@ -1,4 +1,4 @@
-From ac2b8d682a0e26e91eb7bb5ff65d794dd2816310 Mon Sep 17 00:00:00 2001
+From 538ce23bbf917e057f339ee8179c77ab0d936ede 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,10 +18,10 @@ 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 50a27fb..7fdab7d 100644
+index aa76abe..f23636d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -84,6 +84,8 @@ import net.minecraft.server.MinecraftServer;
+@@ -82,6 +82,8 @@ import net.minecraft.server.MinecraftServer;
  import net.minecraft.server.MobEffectList;
  import net.minecraft.server.PropertyManager;
  import net.minecraft.server.ServerCommand;
@@ -30,7 +30,7 @@ index 50a27fb..7fdab7d 100644
  import net.minecraft.server.ServerNBTManager;
  import net.minecraft.server.WorldLoaderServer;
  import net.minecraft.server.WorldManager;
-@@ -996,6 +998,30 @@ public final class CraftServer implements Server {
+@@ -1006,6 +1008,30 @@ public final class CraftServer implements Server {
          worlds.remove(world.getName().toLowerCase());
          console.worlds.remove(console.worlds.indexOf(handle));
  
@@ -62,5 +62,5 @@ index 50a27fb..7fdab7d 100644
      }
  
 -- 
-1.8.5.2.msysgit.0
+1.8.3.2
 

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

@@ -1,4 +1,4 @@
-From fbd77e9599476eb5e29bead4e0118c10e807344c Mon Sep 17 00:00:00 2001
+From 446585e0eddbe05e12d69d9dddc56caf9e623dac 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 7fdab7d..5db2f0a 100644
+index f23636d..f04a35e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1280,7 +1280,7 @@ public final class CraftServer implements Server {
+@@ -1290,7 +1290,7 @@ public final class CraftServer implements Server {
      }
  
      public OfflinePlayer getOfflinePlayer(String name) {
@@ -19,5 +19,5 @@ index 7fdab7d..5db2f0a 100644
  
      public OfflinePlayer getOfflinePlayer(String name, boolean search) {
 -- 
-1.8.5.2.msysgit.0
+1.8.3.2
 

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

@@ -1,14 +1,14 @@
-From 4def1ee6bc8092c8f5c5c291027254fa26422212 Mon Sep 17 00:00:00 2001
+From 5661cb101470cba4d70bcb633b056c7ca6970c7a 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 5db2f0a..420e6e8 100644
+index f04a35e..6e3b4e5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1557,6 +1557,13 @@ public final class CraftServer implements Server {
+@@ -1578,6 +1578,13 @@ public final class CraftServer implements Server {
      }
  
      public List<String> tabCompleteCommand(Player player, String message) {
@@ -38,5 +38,5 @@ index 4d15f8b..8764045 100644
 +    }
  }
 -- 
-1.8.5.2.msysgit.0
+1.8.3.2
 

CraftBukkit-Patches/0036-Configurable-Messages.patch

@@ -1,4 +1,4 @@
-From 6895473e668bcdae04e21e370345ce84942409f2 Mon Sep 17 00:00:00 2001
+From 37e8f2b8631945d9d617a1c3e25f94a822428171 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
@@ -45,10 +45,10 @@ index 1fb24f7..38c37c1 100644
              }
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 420e6e8..9a8d2c2 100644
+index 6e3b4e5..99294ad 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -691,11 +691,7 @@ public final class CraftServer implements Server {
+@@ -701,11 +701,7 @@ public final class CraftServer implements Server {
              return true;
          }
  
@@ -103,5 +103,5 @@ index 8764045..0ab2ec3 100644
 +    }
  }
 -- 
-1.8.5.2.msysgit.0
+1.8.3.2
 

CraftBukkit-Patches/0108-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch

@@ -1,14 +1,14 @@
-From 8953efdfb6f804ebcb5a99e189d52049c3fd0917 Mon Sep 17 00:00:00 2001
+From 40263add90c8f2ebecd54ca10185456268a702ed Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Wed, 12 Feb 2014 20:44:14 +0000
 Subject: [PATCH] Allow vanilla commands to be the main version of a command
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9a8d2c2..a388ec7 100644
+index 99294ad..6912fab 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -118,6 +118,7 @@ import org.bukkit.command.CommandSender;
+@@ -116,6 +116,7 @@ import org.bukkit.command.CommandSender;
  import org.bukkit.command.ConsoleCommandSender;
  import org.bukkit.command.PluginCommand;
  import org.bukkit.command.SimpleCommandMap;
@@ -16,7 +16,7 @@ index 9a8d2c2..a388ec7 100644
  import org.bukkit.configuration.ConfigurationSection;
  import org.bukkit.configuration.file.YamlConfiguration;
  import org.bukkit.configuration.serialization.ConfigurationSerialization;
-@@ -382,8 +383,11 @@ public final class CraftServer implements Server {
+@@ -381,8 +382,11 @@ public final class CraftServer implements Server {
          }
  
          if (type == PluginLoadOrder.POSTWORLD) {
@@ -29,7 +29,7 @@ index 9a8d2c2..a388ec7 100644
              commandMap.registerServerAliases();
              loadCustomPermissions();
              DefaultPermissions.registerCorePermissions();
-@@ -395,51 +399,64 @@ public final class CraftServer implements Server {
+@@ -394,51 +398,64 @@ public final class CraftServer implements Server {
          pluginManager.disablePlugins();
      }
  
@@ -170,5 +170,5 @@ index 7589246..df70756 100644
 +    }
  }
 -- 
-1.8.5.2.msysgit.0
+1.8.3.2
 

CraftBukkit-Patches/0117-Optimize-Player-Lookup.patch

@@ -1,4 +1,4 @@
-From e767a7a0499b068d6195f5b6585b062a45d57fed Mon Sep 17 00:00:00 2001
+From 5058580880735b725b4412d85fb942e0287c5a0b Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 15 Mar 2014 14:34:03 +1100
 Subject: [PATCH] Optimize Player Lookup
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize Player Lookup
 Optimize player lookup and various player operations. We mainly do this by keeping a map instead of iterating through all players. We also speed up the duplicate login check and a few other checks by simply checking for one matching player.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 385dc0a..4a651b6 100644
+index 0d6ffef..c4698d4 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -56,6 +56,25 @@ public abstract class PlayerList {
@@ -103,10 +103,10 @@ index 385dc0a..4a651b6 100644
  
      public List a(ChunkCoordinates chunkcoordinates, int i, int j, int k, int l, int i1, int j1, Map map, String s, String s1, World world) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-index 36bcfef..55df803 100644
+index 24b0066..7fbbcec 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-@@ -101,14 +101,10 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
+@@ -116,14 +116,10 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
      }
  
      public Player getPlayer() {
@@ -126,10 +126,10 @@ index 36bcfef..55df803 100644
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a388ec7..c7f1c95 100644
+index 6912fab..4c089ea 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -503,6 +503,13 @@ public final class CraftServer implements Server {
+@@ -502,6 +502,13 @@ public final class CraftServer implements Server {
      public Player getPlayer(final String name) {
          Validate.notNull(name, "Name cannot be null");
  
@@ -143,7 +143,7 @@ index a388ec7..c7f1c95 100644
          Player[] players = getOnlinePlayers();
  
          Player found = null;
-@@ -524,15 +531,10 @@ public final class CraftServer implements Server {
+@@ -523,15 +530,10 @@ public final class CraftServer implements Server {
      public Player getPlayerExact(String name) {
          Validate.notNull(name, "Name cannot be null");
  
@@ -162,7 +162,7 @@ index a388ec7..c7f1c95 100644
 +        // Spigot End
      }
  
-     public int broadcastMessage(String message) {
+     // TODO: In 1.7.6+ this should use the server's UUID->EntityPlayer map
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 index 5d7e77f..bee7abe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -183,5 +183,5 @@ index 5d7e77f..bee7abe 100644
  
      public InetSocketAddress getAddress() {
 -- 
-1.8.5.2.msysgit.0
+1.8.3.2