Upstream merge

Bukkit

@@ -1 +1 @@
-Subproject commit 1741b91175e4febb000683ac6bc00c4b198e6c47
+Subproject commit 50111157262d31a3b8cd5e63f5478db8139b843a

Bukkit-Patches/0006-BungeeCord-Support.patch

@@ -1,14 +1,14 @@
-From 7cc271bc52e3e97fecb2d288d925f9b7777e380d Mon Sep 17 00:00:00 2001
+From 8e9bba3a806a6d5d2304117410300b74d30b436d Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 15:20:49 +1000
 Subject: [PATCH] BungeeCord Support
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 44c9b5a..21f348b 100644
+index fe8a0bd..e851b98 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1018,4 +1018,23 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1035,4 +1035,23 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
       * @see Player#setHealthScaled(boolean)
       */
      public double getHealthScale();

Bukkit-Patches/0008-Add-Particle-API.patch

@@ -1,4 +1,4 @@
-From 0d3d7850cc74fecc1cddc555e26103f2d44c7b01 Mon Sep 17 00:00:00 2001
+From d62993211f88621e18c42f081425815346e4495e Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 15:57:09 +1000
 Subject: [PATCH] Add Particle API
@@ -327,10 +327,10 @@ index 9bf2c41..6cf3ff0 100644
       * Represents various map environment types that a world may be
       */
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 21f348b..a2ac7a6 100644
+index e851b98..c6bb787 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1033,6 +1033,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1050,6 +1050,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
          {
              throw new UnsupportedOperationException( "Not supported yet." );
          }
@@ -360,5 +360,5 @@ index 08aa71d..5217aec 100644
      }
  }
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0
 

Bukkit-Patches/0015-Player-Collision-API.patch

@@ -1,14 +1,14 @@
-From 240fc02a1e8cc6aa73258b81e2721b03328ad450 Mon Sep 17 00:00:00 2001
+From 07f1e37031ec86f69acce0c4c66deb0d1a978473 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 3 Aug 2013 19:20:50 +1000
 Subject: [PATCH] Player Collision API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index a2ac7a6..55681ff 100644
+index c6bb787..b879ecb 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1038,6 +1038,27 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1055,6 +1055,27 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
          {
              throw new UnsupportedOperationException( "Not supported yet." );
          }
@@ -37,5 +37,5 @@ index a2ac7a6..55681ff 100644
  
      Spigot spigot();
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0
 

Bukkit-Patches/0018-Add-respawn-API.patch

@@ -1,14 +1,14 @@
-From 69c9fcf3b9cf8b0130d1deda78b36aaded807720 Mon Sep 17 00:00:00 2001
+From e97e54dbdcfe6c517061020a5fc377a2249fbd4e Mon Sep 17 00:00:00 2001
 From: ninja- <xninja@openmailbox.org>
 Date: Tue, 8 Oct 2013 14:35:58 +0200
 Subject: [PATCH] Add respawn API.
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 55681ff..5a8c13e 100644
+index b879ecb..6559243 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1059,6 +1059,14 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1076,6 +1076,14 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
          {
              throw new UnsupportedOperationException( "Not supported yet." );
          }
@@ -24,5 +24,5 @@ index 55681ff..5a8c13e 100644
  
      Spigot spigot();
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0
 

Bukkit-Patches/0022-Implement-Locale-Getter-for-Players.patch

@@ -1,14 +1,14 @@
-From 2994d06fa87fd2535a7b464b7a041e2c5c8e9dab Mon Sep 17 00:00:00 2001
+From 57dfad3a6d1085ebc7006402c196285e10e27d6f Mon Sep 17 00:00:00 2001
 From: Smove <jan@lavasurvival.net>
 Date: Sat, 1 Feb 2014 18:10:49 +1100
 Subject: [PATCH] Implement Locale Getter for Players
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 5a8c13e..204c4b2 100644
+index 6559243..2cc19a7 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1067,6 +1067,16 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1084,6 +1084,16 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
          {
              throw new UnsupportedOperationException( "Not supported yet." );
          }
@@ -26,5 +26,5 @@ index 5a8c13e..204c4b2 100644
  
      Spigot spigot();
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0
 

Bukkit-Patches/0023-Add-support-for-fetching-hidden-players.patch

@@ -1,14 +1,14 @@
-From 4a752151018a3b7fe29c65482b3dff42776c0155 Mon Sep 17 00:00:00 2001
+From 267dd31ea425a46cc9c6169944a397dc285f5270 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Sun, 9 Feb 2014 14:02:11 -0500
 Subject: [PATCH] Add support for fetching hidden players
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 204c4b2..6237663 100644
+index 2cc19a7..37c8a58 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1077,6 +1077,16 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1094,6 +1094,16 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
          {
              throw new UnsupportedOperationException( "Not supported yet." );
          }
@@ -26,5 +26,5 @@ index 204c4b2..6237663 100644
  
      Spigot spigot();
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0
 

CraftBukkit

@@ -1 +1 @@
-Subproject commit 08fad7ab1f5ee2662e746b3fd78f14e80084e9b9
+Subproject commit 8f8716c3b73776664ddaf30adf2b7288ffe3ef04

CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch

@@ -1,4 +1,4 @@
-From 1cc16373af997e6e986bf481fb714bf991859bc4 Mon Sep 17 00:00:00 2001
+From e8ce89003cc2749ce11e09334e83f57a4b568f3e Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 15:10:56 +1000
 Subject: [PATCH] Skeleton API Implementations
@@ -64,10 +64,10 @@ index fe0f200..e026c1f 100644
 +    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 4c19370..1d71ff7 100644
+index 17c16dc..3fbbb06 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1253,4 +1253,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1275,4 +1275,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
          collection.add(new AttributeModifiable(getHandle().bb(), (new AttributeRanged("generic.maxHealth", scaledHealth ? healthScale : getMaxHealth(), 0.0D, Float.MAX_VALUE)).a("Max Health").a(true)));
      }
@@ -84,5 +84,5 @@ index 4c19370..1d71ff7 100644
 +    // Spigot end
  }
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0
 

CraftBukkit-Patches/0010-Async-Operation-Catching.patch

@@ -1,4 +1,4 @@
-From 3b727c9b92712a9855872ffa16704ad161ce375a Mon Sep 17 00:00:00 2001
+From b89dc9528c1550605eb17523a2789b50e7ae2ac7 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 25 Mar 2014 16:10:01 +1100
 Subject: [PATCH] Async Operation Catching
@@ -122,10 +122,10 @@ index d9fbd00..bfa8c23 100644
          if (generate) {
              // Use the default variant of loadChunk when generate == true.
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b045cb9..b03037a 100644
+index 3fbbb06..3fee3e8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -231,6 +231,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -232,6 +232,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void kickPlayer(String message) {
@@ -169,5 +169,5 @@ index 0000000..4b3aa85
 +    }
 +}
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0
 

CraftBukkit-Patches/0021-Prevent-NPE-in-CraftSign.patch

@@ -1,4 +1,4 @@
-From 33587a89e702d0898fbdc810a883aefa6fb7d321 Mon Sep 17 00:00:00 2001
+From 6486bb114b1a6e1a2eb2449abf34119d8b7c93a0 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Mon, 18 Mar 2013 20:01:44 +1100
 Subject: [PATCH] Prevent NPE in CraftSign
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent NPE in CraftSign
 This commit prevents the constructor of CraftSign throwing an NPE when it cannot get the sign tile entity. Instead it will fallback to a 4 empty lined sign, and not try to do anything to those lines on .update().
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
-index 1647100..43c4434 100644
+index 77717d5..1533dd4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
 @@ -14,6 +14,12 @@ public class CraftSign extends CraftBlockState implements Sign {
@@ -28,9 +28,9 @@ index 1647100..43c4434 100644
  
 -        if (result) {
 +        if (result && sign != null) { // Spigot, add null check
-             for(int i = 0; i < 4; i++) {
+             sign.lines = sanitizeLines(lines);
-                 if(lines[i] != null) {
+             sign.update();
-                     sign.lines[i] = lines[i];
+         }
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0
 

CraftBukkit-Patches/0046-Player-Collision-API.patch

@@ -1,4 +1,4 @@
-From 860e77cf4f2406d97b047e02f8f15a69e0bcce05 Mon Sep 17 00:00:00 2001
+From 2d1c5eb57b7b0407cbaaf89c84200d6037754f6d Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 3 Aug 2013 19:27:07 +1000
 Subject: [PATCH] Player Collision API
@@ -57,10 +57,10 @@ index 8d98a70..d32a2d2 100644
      public EntityPlayer(MinecraftServer minecraftserver, WorldServer worldserver, GameProfile gameprofile, PlayerInteractManager playerinteractmanager) {
          super(worldserver, gameprofile);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index fdc888d..d61e6fc 100644
+index 3fee3e8..25de653 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1258,6 +1258,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1280,6 +1280,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      // Spigot start
      private final Player.Spigot spigot = new Player.Spigot()
      {
@@ -81,5 +81,5 @@ index fdc888d..d61e6fc 100644
  
      public Player.Spigot spigot()
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0
 

CraftBukkit-Patches/0049-Cap-Minimum-Player-Speed.patch

@@ -1,14 +1,14 @@
-From f63feee9a42d228213e66d8be6428724630265e9 Mon Sep 17 00:00:00 2001
+From a6bd94d3020c20f1984d260da1404e07a31f27dd Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Mon, 5 Aug 2013 20:17:20 +1000
 Subject: [PATCH] Cap Minimum Player Speed
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d61e6fc..df6569a 100644
+index 25de653..633866e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1130,7 +1130,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1152,7 +1152,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void setFlySpeed(float value) {
          validateSpeed(value);
          EntityPlayer player = getHandle();
@@ -17,7 +17,7 @@ index d61e6fc..df6569a 100644
          player.updateAbilities();
  
      }
-@@ -1138,7 +1138,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1160,7 +1160,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void setWalkSpeed(float value) {
          validateSpeed(value);
          EntityPlayer player = getHandle();
@@ -27,5 +27,5 @@ index d61e6fc..df6569a 100644
      }
  
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0
 

CraftBukkit-Patches/0055-Implement-respawn-API.patch

@@ -1,14 +1,14 @@
-From 062f40ae66aa1e8d5c3b3884cc75036a670c9c7f Mon Sep 17 00:00:00 2001
+From d35ec943031fbade450a9230fb0af72a0abb9eaa Mon Sep 17 00:00:00 2001
 From: ninja- <xninja@openmailbox.org>
 Date: Tue, 8 Oct 2013 14:34:49 +0200
 Subject: [PATCH] Implement respawn API.
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index df6569a..b96c27a 100644
+index 633866e..03d6d36 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1271,6 +1271,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1293,6 +1293,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              getHandle().collidesWithEntities = collides;
              getHandle().k = collides; // First boolean of Entity
          }
@@ -25,5 +25,5 @@ index df6569a..b96c27a 100644
  
      public Player.Spigot spigot()
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0
 

CraftBukkit-Patches/0060-BungeeCord-Support.patch

@@ -1,4 +1,4 @@
-From 30e848bc66d5249c518ef64af720b70ac09b15aa Mon Sep 17 00:00:00 2001
+From 4eb238db3911500b14a76a47e87c382e47febb58 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 1 Dec 2013 18:18:41 +1100
 Subject: [PATCH] BungeeCord Support
@@ -98,10 +98,10 @@ index 385dc0a..0d6ffef 100644
          if (this.banByName.isBanned(gameprofile.getName())) {
              BanEntry banentry = (BanEntry) this.banByName.getEntries().get(gameprofile.getName());
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b96c27a..10a91fa 100644
+index 03d6d36..9bc708e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1260,6 +1260,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1282,6 +1282,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      {
  
          @Override
@@ -134,5 +134,5 @@ index 2b499fe..8bfffa5 100644
 +    }
  }
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0
 

CraftBukkit-Patches/0064-Allow-Teleportation-of-Vehicles-and-Passengers.patch

@@ -1,14 +1,14 @@
-From efbd966c4bfc85a6f8444b284def2f23583f5d71 Mon Sep 17 00:00:00 2001
+From 015c23123158d752c654b696b44c42bb32cf514d Mon Sep 17 00:00:00 2001
 From: ItsHarry <info@itsjerryandharry.com>
 Date: Thu, 5 Dec 2013 21:58:11 +0100
 Subject: [PATCH] Allow Teleportation of Vehicles and Passengers
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 8b6e210..a2638bc 100644
+index 9bc708e..76e5643 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -431,9 +431,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -453,9 +453,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              return false;
          }
  
@@ -23,7 +23,7 @@ index 8b6e210..a2638bc 100644
  
          // From = Players current Location
          Location from = this.getLocation();
-@@ -447,6 +449,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -469,6 +471,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          if (event.isCancelled()) {
              return false;
          }

CraftBukkit-Patches/0071-Fire-PreLogin-Events-in-Offline-Mode.patch

@@ -1,4 +1,4 @@
-From ad5d33ab46b0818fa710ab3a1bd9a9a471bc0f11 Mon Sep 17 00:00:00 2001
+From d95c3ac45bb9a2ce9fbe9e241d64e8a1ea467a9a Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 18 Dec 2013 13:32:10 +1100
 Subject: [PATCH] Fire PreLogin Events in Offline Mode
@@ -18,10 +18,10 @@ index efba029..6f35aa0 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/ThreadPlayerLookupUUID.java b/src/main/java/net/minecraft/server/ThreadPlayerLookupUUID.java
-index f48ce53..2723fb8 100644
+index 496b7c9..766b8c7 100644
 --- a/src/main/java/net/minecraft/server/ThreadPlayerLookupUUID.java
 +++ b/src/main/java/net/minecraft/server/ThreadPlayerLookupUUID.java
-@@ -22,47 +22,20 @@ class ThreadPlayerLookupUUID extends Thread {
+@@ -22,48 +22,20 @@ class ThreadPlayerLookupUUID extends Thread {
  
      public void run() {
          try {
@@ -44,13 +44,14 @@ index f48ce53..2723fb8 100644
 -
 -                String playerName = LoginListener.d(this.a).getName();
 -                java.net.InetAddress address = ((java.net.InetSocketAddress) a.networkManager.getSocketAddress()).getAddress();
+-                java.util.UUID uniqueId = UtilUUID.b(LoginListener.d(this.a).getId());
 -                final org.bukkit.craftbukkit.CraftServer server = LoginListener.b(this.a).server;
 -
--                AsyncPlayerPreLoginEvent asyncEvent = new AsyncPlayerPreLoginEvent(playerName, address);
+-                AsyncPlayerPreLoginEvent asyncEvent = new AsyncPlayerPreLoginEvent(playerName, address, uniqueId);
 -                server.getPluginManager().callEvent(asyncEvent);
 -
 -                if (PlayerPreLoginEvent.getHandlerList().getRegisteredListeners().length != 0) {
--                    final PlayerPreLoginEvent event = new PlayerPreLoginEvent(playerName, address);
+-                    final PlayerPreLoginEvent event = new PlayerPreLoginEvent(playerName, address, uniqueId);
 -                    if (asyncEvent.getResult() != PlayerPreLoginEvent.Result.ALLOWED) {
 -                        event.disallow(asyncEvent.getResult(), asyncEvent.getKickMessage());
 -                    }
@@ -80,7 +81,7 @@ index f48ce53..2723fb8 100644
                  LoginListener.e().info("UUID of player " + LoginListener.d(this.a).getName() + " is " + LoginListener.d(this.a).getId());
                  LoginListener.a(this.a, EnumProtocolState.READY_TO_ACCEPT);
              } else {
-@@ -79,4 +52,44 @@ class ThreadPlayerLookupUUID extends Thread {
+@@ -80,4 +52,45 @@ class ThreadPlayerLookupUUID extends Thread {
              // CraftBukkit end
          }
      }
@@ -94,13 +95,14 @@ index f48ce53..2723fb8 100644
 +
 +        String playerName = LoginListener.d(this.a).getName();
 +        java.net.InetAddress address = ((java.net.InetSocketAddress) a.networkManager.getSocketAddress()).getAddress();
++        java.util.UUID uniqueId = UtilUUID.b(LoginListener.d(this.a).getId());
 +        final org.bukkit.craftbukkit.CraftServer server = LoginListener.b(this.a).server;
 +
-+        AsyncPlayerPreLoginEvent asyncEvent = new AsyncPlayerPreLoginEvent(playerName, address);
++        AsyncPlayerPreLoginEvent asyncEvent = new AsyncPlayerPreLoginEvent(playerName, address, uniqueId);
 +        server.getPluginManager().callEvent(asyncEvent);
 +
 +        if (PlayerPreLoginEvent.getHandlerList().getRegisteredListeners().length != 0) {
-+            final PlayerPreLoginEvent event = new PlayerPreLoginEvent(playerName, address);
++            final PlayerPreLoginEvent event = new PlayerPreLoginEvent(playerName, address, uniqueId);
 +            if (asyncEvent.getResult() != PlayerPreLoginEvent.Result.ALLOWED) {
 +                event.disallow(asyncEvent.getResult(), asyncEvent.getKickMessage());
 +            }

CraftBukkit-Patches/0073-Particle-API.patch

@@ -1,4 +1,4 @@
-From 0eb0cb2006777daefa553a233b4ececf0b365e6f Mon Sep 17 00:00:00 2001
+From e93da90956c9591f95ba7d685090290aef18e6d2 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Fri, 20 Dec 2013 21:36:06 +0000
 Subject: [PATCH] Particle API
@@ -117,10 +117,10 @@ index bfa8c23..827ec16 100644
  
      public Spigot spigot()
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 58d1435..1d2a080 100644
+index 76e5643..49fcfba 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1293,6 +1293,49 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1315,6 +1315,49 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
                  server.getServer().getPlayerList().moveToWorld( getHandle(), 0, false );
              }
          }
@@ -171,5 +171,5 @@ index 58d1435..1d2a080 100644
  
      public Player.Spigot spigot()
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0
 

CraftBukkit-Patches/0079-Disable-Connected-Check-on-setScoreboard.patch

@@ -1,14 +1,14 @@
-From 1d8a006504954d64b479160a09317204bfab7a33 Mon Sep 17 00:00:00 2001
+From 7c26ea6b208917f476ce0315d4e6fc4e5836501b Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 23 Dec 2013 15:57:57 +1100
 Subject: [PATCH] Disable Connected Check on setScoreboard
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1d2a080..5677a9b 100644
+index 49fcfba..25aa18e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1193,7 +1193,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1215,7 +1215,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              throw new IllegalStateException("Cannot set scoreboard yet");
          }
          if (playerConnection.isDisconnected()) {
@@ -18,5 +18,5 @@ index 1d2a080..5677a9b 100644
  
          this.server.getScoreboardManager().setPlayerBoard(this, scoreboard);
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0
 

CraftBukkit-Patches/0092-Reduce-memory-of-hiddenPlayers-map.patch

@@ -1,14 +1,14 @@
-From e2defad641150ed835c851d1db39ecc18cb95978 Mon Sep 17 00:00:00 2001
+From 93e44992c776294ea91453698c69a0d9f1efbb4f Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 20 Jan 2014 13:50:32 +1100
 Subject: [PATCH] Reduce memory of hiddenPlayers map.
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3fcab5d..7a96a3f 100644
+index 25aa18e..a220aed 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -63,7 +63,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -64,7 +64,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      private boolean hasPlayedBefore = false;
      private final ConversationTracker conversationTracker = new ConversationTracker();
      private final Set<String> channels = new HashSet<String>();

CraftBukkit-Patches/0100-Implement-Locale-Getter-for-Players.patch

@@ -1,4 +1,4 @@
-From 9cd01b3f2311601709147f261063dfb0a82d3b74 Mon Sep 17 00:00:00 2001
+From 83cf51e11cb329bcf376392d6af7c4921a798e02 Mon Sep 17 00:00:00 2001
 From: Smove <jan@lavasurvival.net>
 Date: Sat, 1 Feb 2014 18:12:16 +1100
 Subject: [PATCH] Implement Locale Getter for Players
@@ -18,10 +18,10 @@ index c1caca7..ca06f60 100644
      public final MinecraftServer server;
      public final PlayerInteractManager playerInteractManager;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 4c3018a..11599fc 100644
+index a220aed..9c55316 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1336,6 +1336,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1358,6 +1358,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
                  getHandle().playerConnection.sendPacket( packet );
              }
          }
@@ -35,5 +35,5 @@ index 4c3018a..11599fc 100644
  
      public Player.Spigot spigot()
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0
 

CraftBukkit-Patches/0105-Add-support-for-fetching-hidden-players.patch

@@ -1,14 +1,14 @@
-From be6adae398e836ab8b44a443eb0f9310d572f1bc Mon Sep 17 00:00:00 2001
+From 2a49f5d8789b6509a1458ccd1550a7e3fddd4f73 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Sun, 9 Feb 2014 14:03:03 -0500
 Subject: [PATCH] Add support for fetching hidden players
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 11599fc..b6eac78 100644
+index 9c55316..024cf9c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1342,6 +1342,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1364,6 +1364,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          {
             return getHandle().locale;
          }
@@ -22,5 +22,5 @@ index 11599fc..b6eac78 100644
  
      public Player.Spigot spigot()
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0
 

CraftBukkit-Patches/0107-Cap-Channel-Registrations.patch

@@ -1,14 +1,14 @@
-From 449f7d4c3da8968c7f41ad21397657d24fee2ae6 Mon Sep 17 00:00:00 2001
+From 89786f9d45d487551d3fce889b99928c86d5189e Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 12 Feb 2014 20:02:58 +1100
 Subject: [PATCH] Cap Channel Registrations
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b6eac78..260502b 100644
+index 024cf9c..3010245 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1024,6 +1024,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1046,6 +1046,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      public void addChannel(String channel) {
@@ -17,5 +17,5 @@ index b6eac78..260502b 100644
              server.getPluginManager().callEvent(new PlayerRegisterChannelEvent(this, channel));
          }
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0
 

CraftBukkit-Patches/0109-Unfinalize-the-isDisconnected-method-by-bukkit.patch

@@ -1,4 +1,4 @@
-From 7bb5cc8ec41e6a6e46862133b9aeeedf74898cab Mon Sep 17 00:00:00 2001
+From d470ed1e358e6167ed990cec13e85ef0e07e6028 Mon Sep 17 00:00:00 2001
 From: hcherndon <hcherndon@gmail.com>
 Date: Sat, 15 Feb 2014 01:51:20 -0600
 Subject: [PATCH] Unfinalize the isDisconnected() method by bukkit.
@@ -6,10 +6,10 @@ Subject: [PATCH] Unfinalize the isDisconnected() method by bukkit.
 This would literally mean the world to me. You have no idea how much this method being final is fucking me over right now. (Working with NPC's and what not.)
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index eb5b84e..ed144b5 100644
+index 0257a00..2603e85 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1892,7 +1892,7 @@ public class PlayerConnection implements PacketPlayInListener {
+@@ -1887,7 +1887,7 @@ public class PlayerConnection implements PacketPlayInListener {
      }
  
      // CraftBukkit start - Add "isDisconnected" method

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

@@ -1,4 +1,4 @@
-From f3cde7b18ec8f58f094daf609cb27ca510342a90 Mon Sep 17 00:00:00 2001
+From bd80ed0c8452bc5386e1564cf0aef2de6bc8cfde 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
@@ -164,10 +164,10 @@ index 5d8c557..707410b 100644
  
      // 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 260502b..a5d3eee 100644
+index 3010245..2ecde57 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -94,13 +94,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -95,13 +95,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      public boolean isOnline() {
@@ -183,5 +183,5 @@ index 260502b..a5d3eee 100644
  
      public InetSocketAddress getAddress() {
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0