Fix resource pack api (Fixes #1634)

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

@@ -1,11 +1,11 @@
-From f9399b2efc351df5f08d0b10387870c05030b2ef Mon Sep 17 00:00:00 2001
+From 5ac595ea87b0142696e012f6ee13638ebda9ac26 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 f22f6a881..d810286d3 100644
+index f22f6a881..972adf9cb 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1243,7 +1243,9 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -18,7 +18,7 @@ index f22f6a881..d810286d3 100644
      public void setResourcePack(String url);
  
      /**
-@@ -1654,6 +1656,57 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1654,6 +1656,60 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
       */
      public void setViewDistance(int viewDistance);
  
@@ -63,7 +63,10 @@ index f22f6a881..d810286d3 100644
 +    /**
 +     * @return the most recent resource pack hash received from the player,
 +     *         or null if no hash has ever been received from this player.
++     *
++     * @deprecated This is no longer sent from the client and will always be null
 +     */
++    @Deprecated
 +    String getResourcePackHash();
 +
 +    /**
@@ -114,5 +117,5 @@ index 4c498016f..aa18a7667 100644
       * Gets the status of this pack.
       *
 -- 
-2.18.0
+2.19.1