Update upstream B/CB

Spigot-API-Patches/0023-Complete-resource-pack-API.patch

@@ -1,14 +1,14 @@
-From c5ee29107fa2ca951596709eb6c5ff26a341f024 Mon Sep 17 00:00:00 2001
+From 915e61ece5914582a738ee9a9e43f37e910307c7 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 4 Apr 2015 22:59:54 -0400
 Subject: [PATCH] Complete resource pack API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 07d8c77..d636c63 100644
+index 99f148c..1498349 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1107,7 +1107,9 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1121,7 +1121,9 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
       * @throws IllegalArgumentException Thrown if the URL is null.
       * @throws IllegalArgumentException Thrown if the URL is too long. The
       *     length restriction is an implementation specific arbitrary value.
@@ -18,7 +18,7 @@ index 07d8c77..d636c63 100644
      public void setResourcePack(String url);
  
      /**
-@@ -1435,6 +1437,57 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1449,6 +1451,57 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
       */
      public void setViewDistance(int viewDistance);
  
@@ -110,5 +110,5 @@ index 4c49801..4c83851 100644
       * Gets the status of this pack.
       *
 -- 
-2.8.0
+2.8.3