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
 

Spigot-API-Patches/0041-Add-String-based-Action-Bar-API.patch

@@ -1,11 +1,11 @@
-From 1a971f56c0bb5fd6dec6ecddeb15e63db5e2cf64 Mon Sep 17 00:00:00 2001
+From f541b6e9582d670d817b710d901685d8ce7d9125 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 20 Dec 2016 15:55:55 -0500
 Subject: [PATCH] Add String based Action Bar API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index d810286d3..993537141 100644
+index 972adf9cb..1d703e7c6 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -431,6 +431,26 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -47,7 +47,7 @@ index d810286d3..993537141 100644
      public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
          spigot().sendMessage(position, components);
      }
-@@ -1790,9 +1812,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1793,9 +1815,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
          /**
           * Sends the component to the specified screen position of this player
           *
@@ -59,7 +59,7 @@ index d810286d3..993537141 100644
          public void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent component) {
              throw new UnsupportedOperationException("Not supported yet.");
          }
-@@ -1800,9 +1824,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1803,9 +1827,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
          /**
           * Sends an array of components as a single message to the specified screen position of this player
           *
@@ -72,5 +72,5 @@ index d810286d3..993537141 100644
              throw new UnsupportedOperationException("Not supported yet.");
          }
 -- 
-2.18.0
+2.19.1
 

Spigot-API-Patches/0087-Player.setPlayerProfile-API.patch

@@ -1,4 +1,4 @@
-From c6ea6282923143d14955acb918df8e32604ae3e9 Mon Sep 17 00:00:00 2001
+From dfa969fa41263825a69021b0c8cfea7fd78590e8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 18 Mar 2018 12:28:55 -0400
 Subject: [PATCH] Player.setPlayerProfile API
@@ -6,7 +6,7 @@ Subject: [PATCH] Player.setPlayerProfile API
 This can be useful for changing name or skins after a player has logged in.
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index fd359fe0b..4020cee58 100644
+index 495bac991..ec37e3e35 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -3,6 +3,7 @@ package org.bukkit.entity;
@@ -17,7 +17,7 @@ index fd359fe0b..4020cee58 100644
  import org.bukkit.Achievement;
  import org.bukkit.ChatColor;
  import org.bukkit.Effect;
-@@ -1758,6 +1759,19 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1761,6 +1762,19 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
       *         was {@link org.bukkit.event.player.PlayerResourcePackStatusEvent.Status#SUCCESSFULLY_LOADED}
       */
      boolean hasResourcePack();
@@ -38,5 +38,5 @@ index fd359fe0b..4020cee58 100644
  
      // Spigot start
 -- 
-2.18.0
+2.19.1
 

Spigot-API-Patches/0148-Expose-attack-cooldown-methods-for-Player.patch

@@ -1,14 +1,14 @@
-From 81fbead5ed0f35706240a2d8d9c3d84db31bf2ad Mon Sep 17 00:00:00 2001
+From b86384c308d48374aa7dd641b03ed8b8b6594745 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 4 Sep 2018 15:01:54 -0500
 Subject: [PATCH] Expose attack cooldown methods for Player
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 6da68835d..ae2b9752b 100644
+index 571a88e62..ba5096ca5 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1909,6 +1909,26 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1912,6 +1912,26 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
       * @param profile The new profile to use
       */
      void setPlayerProfile(PlayerProfile profile);
@@ -36,5 +36,5 @@ index 6da68835d..ae2b9752b 100644
  
      // Spigot start
 -- 
-2.19.0
+2.19.1