SPIGOT-1117: Barrier blocks are transparent for xray purposes

Bukkit-Patches/0002-Spigot-Timings.patch

@@ -1,4 +1,4 @@
-From 211f814d9a23e5695608c46834f2c30c2cfc4869 Mon Sep 17 00:00:00 2001
+From ec04cd369a98a9016ae00a8237a9b5b5835528ab Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 2 Jun 2013 10:42:57 +1000
 Subject: [PATCH] Spigot Timings
@@ -8,10 +8,10 @@ Adds performance tracking timings all around the Minecraft Server, and improves
 Plugins can track their own timings with CustomTimingsHandler
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index fd7d116..c535498 100644
+index d7b88d6..818bfd4 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -541,6 +541,7 @@ public final class Bukkit {
+@@ -542,6 +542,7 @@ public final class Bukkit {
       */
      public static void reload() {
          server.reload();
@@ -19,7 +19,7 @@ index fd7d116..c535498 100644
      }
  
      /**
-@@ -1124,4 +1125,9 @@ public final class Bukkit {
+@@ -1138,4 +1139,9 @@ public final class Bukkit {
      public static UnsafeValues getUnsafe() {
          return server.getUnsafe();
      }
@@ -30,10 +30,10 @@ index fd7d116..c535498 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index ca6c42c..2892a28 100644
+index c2f5de4..f4aa4a8 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -920,4 +920,15 @@ public interface Server extends PluginMessageRecipient {
+@@ -932,4 +932,15 @@ public interface Server extends PluginMessageRecipient {
       */
      @Deprecated
      UnsafeValues getUnsafe();
@@ -50,7 +50,7 @@ index ca6c42c..2892a28 100644
 +    Spigot spigot();
  }
 diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index e5fb0f8..e4c60ca 100644
+index a02c28d..0ba9b1c 100644
 --- a/src/main/java/org/bukkit/command/Command.java
 +++ b/src/main/java/org/bukkit/command/Command.java
 @@ -31,6 +31,7 @@ public abstract class Command {
@@ -69,7 +69,7 @@ index e5fb0f8..e4c60ca 100644
      }
  
      /**
-@@ -207,6 +209,7 @@ public abstract class Command {
+@@ -227,6 +229,7 @@ public abstract class Command {
      public boolean setLabel(String name) {
          this.nextLabel = name;
          if (!isRegistered()) {

Bukkit-Patches/0021-Remove-deprecation-on-some-player-lookup-methods.patch

@@ -1,4 +1,4 @@
-From 993b4ff544073462f7d9b0aae0eb4464c32e3170 Mon Sep 17 00:00:00 2001
+From 986a5a9ab066bf672dfba0e657c47830768bc5a9 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 30 Mar 2014 15:58:22 +1100
 Subject: [PATCH] Remove deprecation on some player lookup methods
@@ -6,10 +6,10 @@ Subject: [PATCH] Remove deprecation on some player lookup methods
 Most of these methods still have plenty of use given that only one player with each name can exist at a time. Deprecating these methods renders even basic functionality such as /msg <name> impossible without causing compiler warnings. We will maintain this API and it should be considered safe and appropriate for most use cases.
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index c535498..95d8c80 100644
+index 818bfd4..584fe11 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -372,12 +372,9 @@ public final class Bukkit {
+@@ -373,12 +373,9 @@ public final class Bukkit {
       * <p>
       * This method may not return objects for offline players.
       *
@@ -22,7 +22,7 @@ index c535498..95d8c80 100644
      public static Player getPlayer(String name) {
          return server.getPlayer(name);
      }
-@@ -385,12 +382,9 @@ public final class Bukkit {
+@@ -386,12 +383,9 @@ public final class Bukkit {
      /**
       * Gets the player with the exact given name, case insensitive.
       *
@@ -35,7 +35,7 @@ index c535498..95d8c80 100644
      public static Player getPlayerExact(String name) {
          return server.getPlayerExact(name);
      }
-@@ -402,12 +396,9 @@ public final class Bukkit {
+@@ -403,12 +397,9 @@ public final class Bukkit {
       * This list is not sorted in any particular order. If an exact match is
       * found, the returned list will only contain a single result.
       *
@@ -49,10 +49,10 @@ index c535498..95d8c80 100644
          return server.matchPlayer(name);
      }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 2892a28..52dd005 100644
+index f4aa4a8..65bf845 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -308,23 +308,17 @@ public interface Server extends PluginMessageRecipient {
+@@ -309,23 +309,17 @@ public interface Server extends PluginMessageRecipient {
       * <p>
       * This method may not return objects for offline players.
       *
@@ -76,7 +76,7 @@ index 2892a28..52dd005 100644
      public Player getPlayerExact(String name);
  
      /**
-@@ -334,12 +328,9 @@ public interface Server extends PluginMessageRecipient {
+@@ -335,12 +329,9 @@ public interface Server extends PluginMessageRecipient {
       * This list is not sorted in any particular order. If an exact match is
       * found, the returned list will only contain a single result.
       *

Bukkit-Patches/0028-BungeeCord-Chat-API.patch

@@ -1,4 +1,4 @@
-From 1c89d256fb6b6aa3b2c1a210af6c0f802473a657 Mon Sep 17 00:00:00 2001
+From 7aea279e8606e39d6d025b915de7d6d1ef01358f Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 13 Dec 2014 12:59:14 +1100
 Subject: [PATCH] BungeeCord Chat API
@@ -268,10 +268,10 @@ index b8872b4..adbae51 100644
       * Gets the char value associated with this color
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 52dd005..20edb77 100644
+index 65bf845..7aa374f 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -919,6 +919,24 @@ public interface Server extends PluginMessageRecipient {
+@@ -931,6 +931,24 @@ public interface Server extends PluginMessageRecipient {
          {
              throw new UnsupportedOperationException( "Not supported yet." );
          }

Bukkit-Patches/0029-Add-restart-API.patch

@@ -1,14 +1,14 @@
-From 5fd845e883d1a8bdb75272d43f02cf42786f9bb3 Mon Sep 17 00:00:00 2001
+From 948e11f2b713bbda226ef75d98763a488ffeaecb Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 13 Jul 2015 19:10:15 +1000
 Subject: [PATCH] Add restart API.
 
 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 20edb77..d9ad0ca 100644
+index 7aa374f..169008a 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -937,6 +937,13 @@ public interface Server extends PluginMessageRecipient {
+@@ -949,6 +949,13 @@ public interface Server extends PluginMessageRecipient {
          public void broadcast(net.md_5.bungee.api.chat.BaseComponent... components) {
              throw new UnsupportedOperationException("Not supported yet.");
          }

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

@@ -1,4 +1,4 @@
-From 458fc7928b658349c076603609fa98fdec6e1a39 Mon Sep 17 00:00:00 2001
+From 0eee1e3cd7129692baef76a063c7a4e62100cf86 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
@@ -6,10 +6,10 @@ Subject: [PATCH] Skeleton API Implementations
 This contains the basic, empty implementations for some Spigot-API extensions. They are included early in the patching progress so that compilation will still succeed midway despite the APIs only being provided by subsequent patches.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f5722c6..5bc3875 100644
+index 82a41b0..5377181 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1636,4 +1636,14 @@ public final class CraftServer implements Server {
+@@ -1642,4 +1642,14 @@ public final class CraftServer implements Server {
      public UnsafeValues getUnsafe() {
          return CraftMagicNumbers.INSTANCE;
      }

CraftBukkit-Patches/0005-Spigot-Configuration.patch

@@ -1,4 +1,4 @@
-From fba1662e39217ab5d0f5db399286c8ee22ba77aa Mon Sep 17 00:00:00 2001
+From 2c218e85d6a9ae48159aa7e90c9911de9dd64fac 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
@@ -55,10 +55,10 @@ index f7c913d..1638081 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 5bc3875..60cc7e8 100644
+index 5377181..d296924 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -247,8 +247,10 @@ public final class CraftServer implements Server {
+@@ -248,8 +248,10 @@ public final class CraftServer implements Server {
          chunkGCLoadThresh = configuration.getInt("chunk-gc.load-threshold");
          loadIcon();
  
@@ -71,7 +71,7 @@ index 5bc3875..60cc7e8 100644
      }
  
      public boolean getCommandBlockOverride(String command) {
-@@ -669,6 +671,7 @@ public final class CraftServer implements Server {
+@@ -670,6 +672,7 @@ public final class CraftServer implements Server {
              logger.log(Level.WARNING, "Failed to load banned-players.json, " + ex.getMessage());
          }
  
@@ -79,7 +79,7 @@ index 5bc3875..60cc7e8 100644
          for (WorldServer world : console.worlds) {
              world.worldData.setDifficulty(difficulty);
              world.setSpawnFlags(monsters, animals);
-@@ -683,11 +686,14 @@ public final class CraftServer implements Server {
+@@ -684,11 +687,14 @@ public final class CraftServer implements Server {
              } else {
                  world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns();
              }

CraftBukkit-Patches/0011-Spigot-Timings.patch

@@ -1,4 +1,4 @@
-From 7661b4adec73bb002c6d5c285781c5162c9d817b Mon Sep 17 00:00:00 2001
+From 187e5343b0d97c46388471e990f21131812b78d3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 10 Jan 2013 00:18:11 -0500
 Subject: [PATCH] Spigot Timings
@@ -134,7 +134,7 @@ index 187d2f4..14d2207 100644
  
      public boolean ae() {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 3fb3502..0e6a905 100644
+index d909705..7dacbd5 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -16,6 +16,7 @@ import org.bukkit.entity.Hanging;
@@ -583,10 +583,10 @@ index 9c0bcfe..8a1165c 100644
  
      public BiomeBase.BiomeMeta a(EnumCreatureType enumcreaturetype, BlockPosition blockposition) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 60cc7e8..6cb262e 100644
+index d296924..a8a8e64 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1646,6 +1646,11 @@ public final class CraftServer implements Server {
+@@ -1652,6 +1652,11 @@ public final class CraftServer implements Server {
      private final Spigot spigot = new Spigot()
      {
  

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

@@ -1,4 +1,4 @@
-From 779b76bf2e439766383b7635b08ccc6b62398b58 Mon Sep 17 00:00:00 2001
+From 621d8db4243864d2a6c265877e56ad14dd54d57f 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 b07e7d5..5528019 100644
      public static synchronized RegionFile a(File file, int i, int j) {
          File file1 = new File(file, "region");
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6cb262e..25e9a70 100644
+index a8a8e64..9e9435e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -961,6 +961,31 @@ public final class CraftServer implements Server {
+@@ -962,6 +962,31 @@ public final class CraftServer implements Server {
  
          worlds.remove(world.getName().toLowerCase());
          console.worlds.remove(console.worlds.indexOf(handle));

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

@@ -1,14 +1,14 @@
-From 8aed6e213a25e12c67b9492fe0ec99b7a847d41e Mon Sep 17 00:00:00 2001
+From aa91333687133d4f19f3659526a058d970366de1 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 25e9a70..7ed538b 100644
+index 9e9435e..5ef5f5a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1565,6 +1565,13 @@ public final class CraftServer implements Server {
+@@ -1566,6 +1566,13 @@ public final class CraftServer implements Server {
      }
  
      public List<String> tabCompleteCommand(Player player, String message) {

CraftBukkit-Patches/0029-Configurable-Messages.patch

@@ -1,11 +1,11 @@
-From 05da710b600ae5090d03f6f0ebe5ad1adfc58f5d Mon Sep 17 00:00:00 2001
+From 746ebed064e6b6e4ed3cb8dea091883103e34faa 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 fa7b6c2..e122df9 100644
+index 2d937c1..53823c6 100644
 --- a/src/main/java/net/minecraft/server/HandshakeListener.java
 +++ b/src/main/java/net/minecraft/server/HandshakeListener.java
 @@ -62,11 +62,11 @@ public class HandshakeListener implements PacketHandshakingInListener {
@@ -45,10 +45,10 @@ index 3838c75..49b908d 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7ed538b..75ea3a5 100644
+index 5ef5f5a..ff60351 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -622,11 +622,7 @@ public final class CraftServer implements Server {
+@@ -623,11 +623,7 @@ public final class CraftServer implements Server {
              return true;
          }
  

CraftBukkit-Patches/0048-Watchdog-Thread.patch

@@ -1,4 +1,4 @@
-From a20fe0d882e5f74abac041edf5cae8ace6d3f497 Mon Sep 17 00:00:00 2001
+From 1bbdb0f376abecacc9b129c2b2bf1f0a5f4bbb4b Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 5 Aug 2014 17:20:19 +0100
 Subject: [PATCH] Watchdog Thread.
@@ -38,10 +38,10 @@ index 05b0b52..98d6bce 100644
          org.spigotmc.CustomTimingsHandler.tick(); // Spigot
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 75ea3a5..6368dbe 100644
+index ff60351..63b5d67 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1679,6 +1679,11 @@ public final class CraftServer implements Server {
+@@ -1685,6 +1685,11 @@ public final class CraftServer implements Server {
          {
              return org.spigotmc.SpigotConfig.config;
          }

CraftBukkit-Patches/0052-Orebfuscator.patch

@@ -1,4 +1,4 @@
-From 994ee97c638d5ac9c57491cab3db44ffb48993cc Mon Sep 17 00:00:00 2001
+From 9d67459b7d193647f8bfef3666e5543e3265a6d9 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 16 May 2013 18:51:05 +1000
 Subject: [PATCH] Orebfuscator
@@ -25,7 +25,7 @@ index 9e0d5ad..ce91553 100644
                                  if (block instanceof BlockFalling) {
                                      ((BlockFalling) block).a_(this.world, blockposition);
 diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
-index 08eca3d..85f2ab5 100644
+index 1ca7e3a..bc4eecb 100644
 --- a/src/main/java/net/minecraft/server/Explosion.java
 +++ b/src/main/java/net/minecraft/server/Explosion.java
 @@ -210,6 +210,7 @@ public class Explosion {
@@ -123,7 +123,7 @@ index b07b3db..2c5c6b0 100644
                  BlockState previous = it.next();
 diff --git a/src/main/java/org/spigotmc/AntiXray.java b/src/main/java/org/spigotmc/AntiXray.java
 new file mode 100644
-index 0000000..6f28cd8
+index 0000000..7221b50
 --- /dev/null
 +++ b/src/main/java/org/spigotmc/AntiXray.java
 @@ -0,0 +1,234 @@
@@ -358,7 +358,7 @@ index 0000000..6f28cd8
 +        // rendering they can be seen through therefor we special
 +        // case them so that the antixray doesn't show the fake
 +        // blocks around them.
-+        return block.isOccluding() && block != Blocks.MOB_SPAWNER;
++        return block.isOccluding() && block != Blocks.MOB_SPAWNER && block != Blocks.BARRIER;
 +    }
 +}
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java

CraftBukkit-Patches/0055-BungeeCord-Support.patch

@@ -1,4 +1,4 @@
-From 64df9839b2e8d17ad823bf8141192f40fe10e073 Mon Sep 17 00:00:00 2001
+From 179f4c4ec3ac77456f264ce16885fe01257c24c4 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
@@ -157,10 +157,10 @@ index 747d708..3e9a4ef 100644
  
          if (getProfileBans().isBanned(gameprofile) && !getProfileBans().get(gameprofile).hasExpired()) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6368dbe..f2ace9a 100644
+index 63b5d67..4c4a090 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -555,7 +555,13 @@ public final class CraftServer implements Server {
+@@ -556,7 +556,13 @@ public final class CraftServer implements Server {
  
      @Override
      public long getConnectionThrottle() {

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

@@ -1,14 +1,14 @@
-From 1f93d5088bcc2a0b71f3386c8f5a02a210c7e1e2 Mon Sep 17 00:00:00 2001
+From f39456a4ac98fa1d30590b9dd850a7181f73c0c0 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 f2ace9a..ec5b77a 100644
+index 4c4a090..103ace8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -317,8 +317,11 @@ public final class CraftServer implements Server {
+@@ -318,8 +318,11 @@ public final class CraftServer implements Server {
          }
  
          if (type == PluginLoadOrder.POSTWORLD) {
@@ -21,7 +21,7 @@ index f2ace9a..ec5b77a 100644
              commandMap.registerServerAliases();
              loadCustomPermissions();
              DefaultPermissions.registerCorePermissions();
-@@ -331,10 +334,19 @@ public final class CraftServer implements Server {
+@@ -332,10 +335,19 @@ public final class CraftServer implements Server {
          pluginManager.disablePlugins();
      }
  

CraftBukkit-Patches/0102-Check-for-blank-OfflinePlayer-Names.patch

@@ -1,14 +1,14 @@
-From ab215e11d9bdcb66d9dfda621c7b4c9051eed1eb Mon Sep 17 00:00:00 2001
+From dfb84fae6c926e7ad278d492ec619e531281954c Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 14 Apr 2014 17:21:24 +1000
 Subject: [PATCH] Check for blank OfflinePlayer Names
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ec5b77a..8b9c9a3 100644
+index 103ace8..573490a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1285,6 +1285,7 @@ public final class CraftServer implements Server {
+@@ -1286,6 +1286,7 @@ public final class CraftServer implements Server {
      @Deprecated
      public OfflinePlayer getOfflinePlayer(String name) {
          Validate.notNull(name, "Name cannot be null");

CraftBukkit-Patches/0109-Don-t-special-case-invalid-usernames-for-UUIDs.patch

@@ -1,14 +1,14 @@
-From 85765920a09d7855268c56f5c48f1e3fb62de2b8 Mon Sep 17 00:00:00 2001
+From 1a57d6484aee8da77a5640699982da4bf55cf923 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 20 Apr 2014 18:58:00 +1000
 Subject: [PATCH] Don't special case 'invalid' usernames for UUIDs.
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8b9c9a3..e0fb365 100644
+index 573490a..0548e76 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1287,11 +1287,6 @@ public final class CraftServer implements Server {
+@@ -1288,11 +1288,6 @@ public final class CraftServer implements Server {
          Validate.notNull(name, "Name cannot be null");
          com.google.common.base.Preconditions.checkArgument( !org.apache.commons.lang.StringUtils.isBlank( name ), "Name cannot be blank" ); // Spigot
  

CraftBukkit-Patches/0138-Only-fetch-an-online-UUID-in-online-mode.patch

@@ -1,4 +1,4 @@
-From 4002c6b3c19aba6c2935ef405c4c460c810fcfd6 Mon Sep 17 00:00:00 2001
+From dc71404d250bca17b69aa1c06e22ab1be2796275 Mon Sep 17 00:00:00 2001
 From: Maxim Van de Wynckel <maxim_vdw@hotmail.com>
 Date: Wed, 30 Jul 2014 01:19:51 +0200
 Subject: [PATCH] Only fetch an online UUID in online mode
@@ -12,10 +12,10 @@ You want to store data for player "Test"  who never joined. An online UUID is cr
 The player Test joins with an offline UUID but that will not match the online UUID of the saved data.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e0fb365..e151098 100644
+index 0548e76..33c6c59 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1289,8 +1289,14 @@ public final class CraftServer implements Server {
+@@ -1290,8 +1290,14 @@ public final class CraftServer implements Server {
  
          OfflinePlayer result = getPlayerExact(name);
          if (result == null) {

CraftBukkit-Patches/0150-BungeeCord-Chat-API.patch

@@ -1,4 +1,4 @@
-From 537ef38fa3026d0dc833a003e64bd54150ca105e Mon Sep 17 00:00:00 2001
+From 771afc9a0280dc580fba5dee3fd2d942c5bd3676 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 13 Dec 2014 13:06:05 +1100
 Subject: [PATCH] BungeeCord Chat API
@@ -56,10 +56,10 @@ index 0000000..6cd5df2
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e151098..df34ddc 100644
+index 33c6c59..f57c785 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -121,6 +121,7 @@ import io.netty.buffer.ByteBufOutputStream;
+@@ -122,6 +122,7 @@ import io.netty.buffer.ByteBufOutputStream;
  import io.netty.buffer.Unpooled;
  import io.netty.handler.codec.base64.Base64;
  import jline.console.ConsoleReader;
@@ -67,7 +67,7 @@ index e151098..df34ddc 100644
  
  public final class CraftServer implements Server {
      private static final Player[] EMPTY_PLAYER_ARRAY = new Player[0];
-@@ -1704,6 +1705,20 @@ public final class CraftServer implements Server {
+@@ -1710,6 +1711,20 @@ public final class CraftServer implements Server {
          public void restart() {
              org.spigotmc.RestartCommand.restart();
          }