Upstream merge: 1.7.9

Bukkit

@@ -1 +1 @@
-Subproject commit ec19988db3ba9415f9453c68b4861ffbe90e4153
+Subproject commit 8652e1ff2838e16b7a4e141a37c8bf45299b6edd

Bukkit-Patches/0001-POM-Changes.patch

@@ -1,11 +1,11 @@
-From 2a8bbf154f5283abc9ed94eabf0c47dfa54c07c7 Mon Sep 17 00:00:00 2001
+From 168645b6eec4fbdde9ca863f240fecdf9f63ca4c 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 ec3d67d..cc5863e 100644
+index feac8db..aa8a63d 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,43 +1,23 @@
@@ -23,7 +23,7 @@ index ec3d67d..cc5863e 100644
 +
 +    <groupId>org.spigotmc</groupId>
 +    <artifactId>spigot-api</artifactId>
-     <version>1.7.8-R0.1-SNAPSHOT</version>
+     <version>1.7.9-R0.1-SNAPSHOT</version>
 -    <name>Bukkit</name>
 -    <url>http://www.bukkit.org</url>
 +    <name>Spigot-API</name>
@@ -65,5 +65,5 @@ index ec3d67d..cc5863e 100644
          <plugins>
              <plugin>
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0
 

CraftBukkit

@@ -1 +1 @@
-Subproject commit 5fc3995ea8e455fe25eedaa7e4c44d054270371d
+Subproject commit e027d69be8349978ffcc16d240d3141a981ea791

CraftBukkit-Patches/0001-POM-Changes.patch

@@ -1,11 +1,11 @@
-From c21c052e42fcd93deab9697a730ad59a4f874ffa Mon Sep 17 00:00:00 2001
+From d36fbfecfe40509da20f581af79322589ead5414 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 3d4395d..2b14bef 100644
+index 84a00a3..607be4e 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,12 +1,20 @@
@@ -25,7 +25,7 @@ index 3d4395d..2b14bef 100644
 +  <groupId>org.spigotmc</groupId>
 +  <artifactId>spigot</artifactId>
    <packaging>jar</packaging>
-   <version>1.7.8-R0.1-SNAPSHOT</version>
+   <version>1.7.9-R0.1-SNAPSHOT</version>
 -  <name>CraftBukkit</name>
 -  <url>http://www.bukkit.org</url>
 +  <name>Spigot</name>
@@ -142,7 +142,7 @@ index 3d4395d..2b14bef 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 e33576d..f3d9979 100644
+index 111abb8..59010eb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -310,7 +310,7 @@ public final class CraftServer implements Server {
@@ -168,5 +168,5 @@ index f905d17..9304637 100644
  
          if (stream != null) {
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0
 

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

@@ -1,14 +1,14 @@
-From b54f2ca74f3ad0197f6e6752fa77331f692a1b01 Mon Sep 17 00:00:00 2001
+From aa2ab38ef8d7f09799c720331bc3d0daf0495848 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 875f25f..2331d6a 100644
+index f66f764..53be9ae 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1600,6 +1600,13 @@ public final class CraftServer implements Server {
+@@ -1598,6 +1598,13 @@ public final class CraftServer implements Server {
      }
  
      public List<String> tabCompleteCommand(Player player, String message) {
@@ -49,5 +49,5 @@ index afd6b56..20634f1 100644
 +    }
  }
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0
 

CraftBukkit-Patches/0036-Configurable-Messages.patch

@@ -1,29 +1,29 @@
-From cc8dcd7fc704565b2e5cc4a9731254456909b6b1 Mon Sep 17 00:00:00 2001
+From 016f8aa9bddc612afe059039bca58912be065b64 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
 
 
 diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
-index 17e69db..b98079c 100644
+index 9cc9581..b98079c 100644
 --- a/src/main/java/net/minecraft/server/HandshakeListener.java
 +++ b/src/main/java/net/minecraft/server/HandshakeListener.java
 @@ -64,11 +64,11 @@ public class HandshakeListener implements PacketHandshakingInListener {
              // CraftBukkit end
  
              if (packethandshakinginsetprotocol.d() > 5) {
--                chatcomponenttext = new ChatComponentText("Outdated server! I\'m still on 1.7.8");
+-                chatcomponenttext = new ChatComponentText("Outdated server! I\'m still on 1.7.9");
 +                chatcomponenttext = new ChatComponentText( org.spigotmc.SpigotConfig.outdatedServerMessage ); // Spigot
                  this.b.handle(new PacketLoginOutDisconnect(chatcomponenttext), new GenericFutureListener[0]);
                  this.b.close(chatcomponenttext);
              } else if (packethandshakinginsetprotocol.d() < 5) {
--                chatcomponenttext = new ChatComponentText("Outdated client! Please use 1.7.8");
+-                chatcomponenttext = new ChatComponentText("Outdated client! Please use 1.7.9");
 +                chatcomponenttext = new ChatComponentText( org.spigotmc.SpigotConfig.outdatedClientMessage ); // Spigot
                  this.b.handle(new PacketLoginOutDisconnect(chatcomponenttext), new GenericFutureListener[0]);
                  this.b.close(chatcomponenttext);
              } else {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index e1e0e92..2afba41 100644
+index 2a15271..e156a5a 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -365,7 +365,7 @@ public abstract class PlayerList {
@@ -31,8 +31,8 @@ index e1e0e92..2afba41 100644
          } else if (!this.isWhitelisted(gameprofile)) {
              // return "You are not white-listed on this server!";
 -            event.disallow(PlayerLoginEvent.Result.KICK_WHITELIST, "You are not white-listed on this server!");
-+event.disallow(PlayerLoginEvent.Result.KICK_WHITELIST, org.spigotmc.SpigotConfig.whitelistMessage); // Spigot
++            event.disallow(PlayerLoginEvent.Result.KICK_WHITELIST, org.spigotmc.SpigotConfig.whitelistMessage); // Spigot
-         } else if (this.k.isBanned(socketaddress)) {
+         } else if (this.k.isBanned(socketaddress) && !this.j.get(gameprofile).e()) { // Should be hasExpired
              IpBanEntry ipbanentry = this.k.get(socketaddress);
  
 @@ -379,7 +379,7 @@ public abstract class PlayerList {
@@ -45,7 +45,7 @@ index e1e0e92..2afba41 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2331d6a..8d33f56 100644
+index 53be9ae..e209ef4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -708,11 +708,7 @@ public final class CraftServer implements Server {
@@ -103,5 +103,5 @@ index 20634f1..efcd193 100644
 +    }
  }
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0
 

CraftBukkit-Patches/0043-Prevent-Ghost-Players-Caused-by-Plugins.patch

@@ -1,4 +1,4 @@
-From 34d0001f99b84405fa2ae14bc74507764eaa6c14 Mon Sep 17 00:00:00 2001
+From a6a707a02e69a180f31f1eaf005a5bf9e610e43c Mon Sep 17 00:00:00 2001
 From: Alex Ciuba <alexciuba@gmail.com>
 Date: Tue, 11 Jun 2013 15:23:03 -0400
 Subject: [PATCH] Prevent Ghost Players Caused by Plugins
@@ -6,10 +6,10 @@ Subject: [PATCH] Prevent Ghost Players Caused by Plugins
 Check if the player is still connected after firing event. Fixes BUKKIT-4327
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 0208191..9c98a62 100644
+index e156a5a..4c5d77e 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -492,6 +492,11 @@ event.disallow(PlayerLoginEvent.Result.KICK_WHITELIST, org.spigotmc.SpigotConfig
+@@ -492,6 +492,11 @@ public abstract class PlayerList {
              Player respawnPlayer = this.cserver.getPlayer(entityplayer1);
              PlayerRespawnEvent respawnEvent = new PlayerRespawnEvent(respawnPlayer, location, isBedSpawn);
              this.cserver.getPluginManager().callEvent(respawnEvent);
@@ -22,5 +22,5 @@ index 0208191..9c98a62 100644
              location = respawnEvent.getRespawnLocation();
              entityplayer.reset();
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0
 

CraftBukkit-Patches/0068-BungeeCord-Support.patch

@@ -1,4 +1,4 @@
-From 969ea97d8abf9fb99e0a647371546068db211211 Mon Sep 17 00:00:00 2001
+From e676d1bb122f90e416e214117e3a4bcc5ade4fb6 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
@@ -93,7 +93,7 @@ index 0755d36..e380a70 100644
      // Spigot end
  
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 1dd2227..e8e20fd 100644
+index 1b080c7..31d6008 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -6,6 +6,7 @@ import javax.crypto.SecretKey;
@@ -104,7 +104,7 @@ index 1dd2227..e8e20fd 100644
  import net.minecraft.util.io.netty.channel.Channel;
  import net.minecraft.util.io.netty.channel.ChannelFutureListener;
  import net.minecraft.util.io.netty.channel.ChannelHandlerContext;
-@@ -36,7 +37,11 @@ public class NetworkManager extends SimpleChannelInboundHandler {
+@@ -37,7 +38,11 @@ public class NetworkManager extends SimpleChannelInboundHandler {
      private final Queue k = Queues.newConcurrentLinkedQueue();
      private final Queue l = Queues.newConcurrentLinkedQueue();
      private Channel m;
@@ -117,7 +117,7 @@ index 1dd2227..e8e20fd 100644
      private PacketListener o;
      private EnumProtocol p;
      private IChatBaseComponent q;
-@@ -198,4 +203,11 @@ public class NetworkManager extends SimpleChannelInboundHandler {
+@@ -207,4 +212,11 @@ public class NetworkManager extends SimpleChannelInboundHandler {
      static Channel a(NetworkManager networkmanager) {
          return networkmanager.m;
      }
@@ -143,7 +143,7 @@ index 16d4765..39692ee 100644
          this.d = EnumProtocol.a(packetdataserializer.a());
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 9c98a62..d2a378e 100644
+index 4c5d77e..cd9a8f5 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -350,7 +350,7 @@ public abstract class PlayerList {
@@ -154,9 +154,9 @@ index 9c98a62..d2a378e 100644
 +        PlayerLoginEvent event = new PlayerLoginEvent(player, hostname, ((java.net.InetSocketAddress) socketaddress).getAddress(), ((java.net.InetSocketAddress) loginlistener.networkManager.getRawAddress()).getAddress());
          String s;
  
-         if (this.j.isBanned(gameprofile)) {
+         if (this.j.isBanned(gameprofile) && !this.j.get(gameprofile).e()) { // Should be hasExpired
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d7934b4..cb858a0 100644
+index b4488f6..27e6fb9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1299,6 +1299,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -192,5 +192,5 @@ index 2b499fe..8bfffa5 100644
 +    }
  }
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0
 

CraftBukkit-Patches/0094-Highly-Optimized-Tick-Loop.patch

@@ -1,11 +1,11 @@
-From 94ecacd1a98659fa044569f98daf4f118ee305b3 Mon Sep 17 00:00:00 2001
+From 45ebc973b86bf0604e180ae7a6b2d3ecc7ccd534 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 25 Jan 2014 14:08:35 +1100
 Subject: [PATCH] Highly Optimized Tick Loop
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 8738e28..170e097 100644
+index b52c101..b905ceb 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -107,6 +107,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -36,7 +36,7 @@ index 8738e28..170e097 100644
          try {
              if (this.init()) {
 @@ -442,38 +455,34 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
-                 this.q.setServerInfo(new ServerPingServerData("1.7.8", 5));
+                 this.q.setServerInfo(new ServerPingServerData("1.7.9", 5));
                  this.a(this.q);
  
 +                // Spigot start
@@ -161,5 +161,5 @@ index 0000000..2b8343d
 +    }
 +}
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0
 

CraftBukkit-Patches/0121-Enable-Improved-Ping-Sending.patch

@@ -1,4 +1,4 @@
-From 3af39a545256010c77a43b92a78a6ffe89291f67 Mon Sep 17 00:00:00 2001
+From 33e15a4463401f66e8ca222ecfdb7584ec25af4d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 24 Feb 2013 20:45:20 +1100
 Subject: [PATCH] Enable Improved Ping Sending
@@ -17,10 +17,10 @@ index 4fb5f75..c164e39 100644
      // Spigot start
      public boolean collidesWithEntities = true;
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index d2a378e..9abf099 100644
+index cd9a8f5..8be8e9c 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -793,6 +793,8 @@ event.disallow(PlayerLoginEvent.Result.KICK_WHITELIST, org.spigotmc.SpigotConfig
+@@ -793,6 +793,8 @@ public abstract class PlayerList {
          // CraftBukkit end
      }
  
@@ -29,7 +29,7 @@ index d2a378e..9abf099 100644
      public void tick() {
          if (++this.t > 600) {
              this.t = 0;
-@@ -805,6 +807,30 @@ event.disallow(PlayerLoginEvent.Result.KICK_WHITELIST, org.spigotmc.SpigotConfig
+@@ -805,6 +807,30 @@ public abstract class PlayerList {
              this.sendAll(new PacketPlayOutPlayerInfo(entityplayer.getName(), true, entityplayer.ping));
          }
          // CraftBukkit end */
@@ -61,5 +61,5 @@ index d2a378e..9abf099 100644
  
      public void sendAll(Packet packet) {
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0
 

CraftBukkit-Patches/0125-Old-New-Version-Support.patch

@@ -1,4 +1,4 @@
-From d599a3be18665b9ca05fd1eabde7b0e2e3e5ff23 Mon Sep 17 00:00:00 2001
+From db0c6edd29ec690814c9a07bb9c5e4a20237b12d Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 12 Apr 2014 15:11:15 +1000
 Subject: [PATCH] Old / New Version Support.
@@ -28,10 +28,10 @@ index ee24038..2ef286e 100644
                  this.b.handle(new PacketLoginOutDisconnect(chatcomponenttext), new GenericFutureListener[0]);
                  this.b.close(chatcomponenttext);
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index e8e20fd..8514dd6 100644
+index 31d6008..0c10e18 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
-@@ -46,6 +46,19 @@ public class NetworkManager extends SimpleChannelInboundHandler {
+@@ -47,6 +47,19 @@ public class NetworkManager extends SimpleChannelInboundHandler {
      private EnumProtocol p;
      private IChatBaseComponent q;
      private boolean r;
@@ -214,5 +214,5 @@ index 6423aec..f1571f1 100644
          this.networkManager.handle(new PacketStatusOutServerInfo(ping), new GenericFutureListener[0]);
          // CraftBukkit end
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0
 

CraftBukkit-Patches/0132-Print-Stack-on-InternalException.patch

@@ -1,21 +1,21 @@
-From 1a678d0c1e635bdb4e25f9b59488d1e094c33089 Mon Sep 17 00:00:00 2001
+From ededca7f1e9805ebe0941ac01665b45238bc4c22 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 13 Apr 2014 09:00:59 +1000
 Subject: [PATCH] Print Stack on InternalException
 
 
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 8514dd6..6321eac 100644
+index 0c10e18..d1b9c49 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
-@@ -85,6 +85,7 @@ public class NetworkManager extends SimpleChannelInboundHandler {
+@@ -94,6 +94,7 @@ public class NetworkManager extends SimpleChannelInboundHandler {
+         }
  
-     public void exceptionCaught(ChannelHandlerContext channelhandlercontext, Throwable throwable) {
+         this.close(chatmessage);
-         this.close(new ChatMessage("disconnect.genericReason", new Object[] { "Internal Exception: " + throwable}));
 +        if (MinecraftServer.getServer().isDebugging()) throwable.printStackTrace(); // Spigot
      }
  
      protected void a(ChannelHandlerContext channelhandlercontext, Packet packet) {
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0
 

CraftBukkit-Patches/0139-Fix-ban-expire-dates.patch

@@ -1,4 +1,4 @@
-From 9f03ca02e47d495436644f7ea610464e225e07e7 Mon Sep 17 00:00:00 2001
+From b2bad76db2be7ed3a017f21d65ca80010b08090b Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 16 Apr 2014 10:09:56 +1000
 Subject: [PATCH] Fix ban expire dates.
@@ -18,5 +18,5 @@ index 3738b3e..4e8ffd4 100644
  
      public GameProfileBanEntry(JsonObject jsonobject) {
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0
 

CraftBukkit-Patches/0139-Validate-CraftSkull-getOwner.patch

@@ -1,21 +0,0 @@
-From 36a609b6a7bf7ad658a1018997921c7bd0faf612 Mon Sep 17 00:00:00 2001
-From: md_5 <git@md-5.net>
-Date: Wed, 16 Apr 2014 09:46:48 +1000
-Subject: [PATCH] Validate CraftSkull getOwner
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java
-index d544760..29778c0 100644
---- a/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java
-@@ -146,6 +146,7 @@ public class CraftSkull extends CraftBlockState implements Skull {
-     }
- 
-     public String getOwner() {
-+        com.google.common.base.Preconditions.checkState( hasOwner(), "Cannot call getOwner if skull has no owner!" ); // Spigot
-         return profile.getName();
-     }
- 
--- 
-1.8.3.2
-

CraftBukkit-Patches/0140-Correct-Ban-Expiration.patch

@@ -1,11 +1,11 @@
-From 0e528ef69bd5fd8bce2e8478c514832f671605e5 Mon Sep 17 00:00:00 2001
+From 201a50c0093ef26e019636b70eaffc71da547e56 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 16 Apr 2014 11:14:38 +1000
 Subject: [PATCH] Correct Ban Expiration
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index bbed3f4..77266d7 100644
+index 8be8e9c..49837b4 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -362,7 +362,7 @@ public abstract class PlayerList {
@@ -16,7 +16,7 @@ index bbed3f4..77266d7 100644
 +            if (!gameprofilebanentry.e()) event.disallow(PlayerLoginEvent.Result.KICK_BANNED, s); // Spigot
          } else if (!this.isWhitelisted(gameprofile)) {
              // return "You are not white-listed on this server!";
- event.disallow(PlayerLoginEvent.Result.KICK_WHITELIST, org.spigotmc.SpigotConfig.whitelistMessage); // Spigot
+             event.disallow(PlayerLoginEvent.Result.KICK_WHITELIST, org.spigotmc.SpigotConfig.whitelistMessage); // Spigot
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0
 

CraftBukkit-Patches/0141-Convert-Horses-owner-to-UUID.patch

@@ -1,4 +1,4 @@
-From e7cf1c84bf12977ad68f5d61e1dfb6e416b729b2 Mon Sep 17 00:00:00 2001
+From b10521c8fbd8be80380d7a0f625b20d4ad80e70e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 16 Apr 2014 01:40:30 -0400
 Subject: [PATCH] Convert Horses owner to UUID
@@ -24,5 +24,5 @@ index 5978ea3..1b1ed9b 100644
          if (nbttagcompound.hasKey("Bukkit.MaxDomestication")) {
              this.maxDomestication = nbttagcompound.getInt("Bukkit.MaxDomestication");
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0
 

CraftBukkit-Patches/0142-Expand-team-API-to-allow-arbitrary-strings.patch

@@ -1,4 +1,4 @@
-From 3444f11224082b3bafcb91dfa3327946dd128a19 Mon Sep 17 00:00:00 2001
+From 744d4cfaf407ae2e63c7c34683fc152315186c68 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Thu, 17 Apr 2014 19:22:22 +1000
 Subject: [PATCH] Expand team API to allow arbitrary strings.
@@ -84,5 +84,5 @@ index 8a640d3..a1864a5 100644
  
      @Override
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0
 

CraftBukkit-Patches/0143-Add-Score.isScoreSet-Z-API.patch

@@ -1,4 +1,4 @@
-From ff88954cd61861bd5bf8a26feeca291491e90fa0 Mon Sep 17 00:00:00 2001
+From 6b02ebd8eebd2581c191540583e61495ccd725f5 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Thu, 17 Apr 2014 19:35:53 +1000
 Subject: [PATCH] Add Score.isScoreSet()Z API.
@@ -35,5 +35,5 @@ index 7095f6d..b265616 100644
          return objective.getScoreboard();
      }
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0
 

CraftBukkit-Patches/0144-Add-quiet-option-to-hasKeyOfType.patch

@@ -1,4 +1,4 @@
-From 9311ebaaee26e191601040dc2636073ed58b4245 Mon Sep 17 00:00:00 2001
+From af1ffa18a57d7474ab9c79f7f2af16e02bc7d867 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Thu, 17 Apr 2014 12:58:08 +0100
 Subject: [PATCH] Add quiet option to hasKeyOfType

CraftBukkit-Patches/0146-Stop-player-skull-s-name-being-incorrectly-set-to-th.patch

@@ -1,29 +0,0 @@
-From 3f29564abde66be189515e902fba65c95615cf91 Mon Sep 17 00:00:00 2001
-From: Thinkofdeath <thethinkofdeath@gmail.com>
-Date: Thu, 17 Apr 2014 13:00:05 +0100
-Subject: [PATCH] Stop player skull's name being incorrectly set to the
- profiles's toString
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-index 41efa55..c484c57 100644
---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-@@ -32,7 +32,13 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
-         super(tag);
- 
-         if (tag.hasKey(SKULL_OWNER.NBT)) {
--            player = tag.getString(SKULL_OWNER.NBT);
-+            if ( tag.hasKeyOfType( SKULL_OWNER.NBT, 10, true ) )
-+            {
-+                player = net.minecraft.server.GameProfileSerializer.a( tag.getCompound( SKULL_OWNER.NBT ) ).getName();
-+            } else if ( tag.hasKeyOfType( SKULL_OWNER.NBT, 8 ) )
-+            {
-+                player = tag.getString( SKULL_OWNER.NBT );
-+            }
-         }
-     }
- 
--- 
-1.8.5.2.msysgit.0
-