Fix resource pack api (Fixes #1634)downloads

14 files changed, 85 insertions, 65 deletions

diff --git a/Spigot-API-Patches/0020-Complete-resource-pack-API.patch b/Spigot-API-Patches/0020-Complete-resource-pack-API.patch
index 83ad5ccbf8..0386cee121 100644
--- a/Spigot-API-Patches/0020-Complete-resource-pack-API.patch
+++ b/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 <[email protected]>
 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
 
diff --git a/Spigot-API-Patches/0041-Add-String-based-Action-Bar-API.patch b/Spigot-API-Patches/0041-Add-String-based-Action-Bar-API.patch
index 0f0abae39c..4041731648 100644
--- a/Spigot-API-Patches/0041-Add-String-based-Action-Bar-API.patch
+++ b/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 <[email protected]>
 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
 
diff --git a/Spigot-API-Patches/0087-Player.setPlayerProfile-API.patch b/Spigot-API-Patches/0087-Player.setPlayerProfile-API.patch
index 4d20eaf1fb..760b410d11 100644
--- a/Spigot-API-Patches/0087-Player.setPlayerProfile-API.patch
+++ b/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 <[email protected]>
 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
 
diff --git a/Spigot-API-Patches/0148-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-API-Patches/0148-Expose-attack-cooldown-methods-for-Player.patch
index 4d8c3335df..ab1c825a17 100644
--- a/Spigot-API-Patches/0148-Expose-attack-cooldown-methods-for-Player.patch
+++ b/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 <[email protected]>
 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
 
diff --git a/Spigot-Server-Patches/0060-Complete-resource-pack-API.patch b/Spigot-Server-Patches/0060-Complete-resource-pack-API.patch
index 2382843f8e..2b9d8de342 100644
--- a/Spigot-Server-Patches/0060-Complete-resource-pack-API.patch
+++ b/Spigot-Server-Patches/0060-Complete-resource-pack-API.patch
@@ -1,11 +1,28 @@
-From 5c95037bbbfbc205d23d3c492d634c31d69e9da8 Mon Sep 17 00:00:00 2001
+From ee25e56e59c6e8eacfd71d261bb54413bf996248 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <[email protected]>
 Date: Sat, 4 Apr 2015 23:17:52 -0400
 Subject: [PATCH] Complete resource pack API
 
 
+diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
+index f2e7762d30..e79ab51d29 100644
+--- a/src/main/java/net/minecraft/server/PlayerConnection.java
++++ b/src/main/java/net/minecraft/server/PlayerConnection.java
+@@ -1324,7 +1324,11 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+     // CraftBukkit start
+     public void a(PacketPlayInResourcePackStatus packetplayinresourcepackstatus) {
+         PlayerConnectionUtils.ensureMainThread(packetplayinresourcepackstatus, this, this.player.getWorldServer());
+-        this.server.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(getPlayer(), PlayerResourcePackStatusEvent.Status.values()[packetplayinresourcepackstatus.status.ordinal()]));
++        // Paper start
++        PlayerResourcePackStatusEvent.Status packStatus = PlayerResourcePackStatusEvent.Status.values()[packetplayinresourcepackstatus.status.ordinal()];
++        player.getBukkitEntity().setResourcePackStatus(packStatus);
++        this.server.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(getPlayer(), packStatus));
++        // Paper end
+     }
+     // CraftBukkit end
+ 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 15a99220ca..33bbda62f2 100644
+index 49ea29eecc..031b30e3e3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -128,6 +128,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -53,5 +70,5 @@ index 15a99220ca..33bbda62f2 100644
      private final Player.Spigot spigot = new Player.Spigot()
      {
 -- 
-2.19.0
+2.19.1
 
diff --git a/Spigot-Server-Patches/0091-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-Server-Patches/0091-Add-PlayerUseUnknownEntityEvent.patch
index a09b94219b..c13a637bbf 100644
--- a/Spigot-Server-Patches/0091-Add-PlayerUseUnknownEntityEvent.patch
+++ b/Spigot-Server-Patches/0091-Add-PlayerUseUnknownEntityEvent.patch
@@ -1,4 +1,4 @@
-From 5022f9e018267160b070c24bd0578fe6f0013692 Mon Sep 17 00:00:00 2001
+From 7726e17d4e02cf33ce44a92a905cc2c7c433efc1 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <[email protected]>
 Date: Sat, 2 Apr 2016 05:09:16 -0400
 Subject: [PATCH] Add PlayerUseUnknownEntityEvent
@@ -18,10 +18,10 @@ index a4b98c81f5..53d38ea40f 100644
      private Vec3D c;
      private EnumHand d;
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 7362b73b20..4df7b4a249 100644
+index e79ab51d29..085fa8cd49 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1905,6 +1905,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1909,6 +1909,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                  }
              }
          }
@@ -39,5 +39,5 @@ index 7362b73b20..4df7b4a249 100644
      }
  
 -- 
-2.19.0
+2.19.1
 
diff --git a/Spigot-Server-Patches/0098-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/Spigot-Server-Patches/0098-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
index 99db97868f..bfd77ac883 100644
--- a/Spigot-Server-Patches/0098-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+++ b/Spigot-Server-Patches/0098-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
@@ -1,4 +1,4 @@
-From 96c24465ced08e0ea6b29a38191a7e68b5673ba7 Mon Sep 17 00:00:00 2001
+From 5cc44c28c0d182313770f065b72b9800d49c497b Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Wed, 6 Apr 2016 01:04:23 -0500
 Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names
@@ -19,7 +19,7 @@ index 6fe3c0ea8a..cf523a3e48 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 7275c4d21a..83de2d63a5 100644
+index e44d8372d8..4c5dc39e3a 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2259,6 +2259,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -31,10 +31,10 @@ index 7275c4d21a..83de2d63a5 100644
      public ScoreboardTeamBase be() {
          if (!this.world.paperConfig.nonPlayerEntitiesOnScoreboards && !(this instanceof EntityHuman)) { return null; } // Paper
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 4df7b4a249..ba690d5bd0 100644
+index 085fa8cd49..66de10ada5 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1634,7 +1634,15 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1638,7 +1638,15 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                      return;
                  }
  
@@ -52,5 +52,5 @@ index 4df7b4a249..ba690d5bd0 100644
                  if (((LazyPlayerSet) event.getRecipients()).isLazy()) {
                      for (Object recipient : minecraftServer.getPlayerList().players) {
 -- 
-2.19.0
+2.19.1
 
diff --git a/Spigot-Server-Patches/0132-Fix-AIOOBE-in-inventory-handling.patch b/Spigot-Server-Patches/0132-Fix-AIOOBE-in-inventory-handling.patch
index dabd6d713d..c903365fad 100644
--- a/Spigot-Server-Patches/0132-Fix-AIOOBE-in-inventory-handling.patch
+++ b/Spigot-Server-Patches/0132-Fix-AIOOBE-in-inventory-handling.patch
@@ -1,14 +1,14 @@
-From 11333f7c95d933a90522c37fa3579f2aee1fdaed Mon Sep 17 00:00:00 2001
+From 78e1e716c0acafe6e2c97883953a21155bc05bb3 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <[email protected]>
 Date: Sun, 4 Sep 2016 16:35:43 -0500
 Subject: [PATCH] Fix AIOOBE in inventory handling
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 1dce60f8cc..aad33272f0 100644
+index 51fe740482..931dc0e8ca 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2098,7 +2098,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2102,7 +2102,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                      case CLONE:
                          if (packetplayinwindowclick.d() == 2) {
                              click = ClickType.MIDDLE;
@@ -18,5 +18,5 @@ index 1dce60f8cc..aad33272f0 100644
                              } else {
                                  Slot slot = this.player.activeContainer.getSlot(packetplayinwindowclick.c());
 -- 
-2.19.0
+2.19.1
 
diff --git a/Spigot-Server-Patches/0159-Properly-fix-item-duplication-bug.patch b/Spigot-Server-Patches/0159-Properly-fix-item-duplication-bug.patch
index 15a6b49cee..480c949915 100644
--- a/Spigot-Server-Patches/0159-Properly-fix-item-duplication-bug.patch
+++ b/Spigot-Server-Patches/0159-Properly-fix-item-duplication-bug.patch
@@ -1,4 +1,4 @@
-From cd0d471d3222cdc103bedb9bd07621ec2f098cc1 Mon Sep 17 00:00:00 2001
+From f8621a1a15d2b596adcbeb66fbf572b256531b98 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <[email protected]>
 Date: Tue, 27 Dec 2016 01:57:57 +0000
 Subject: [PATCH] Properly fix item duplication bug
@@ -6,7 +6,7 @@ Subject: [PATCH] Properly fix item duplication bug
 Credit to prplz for figuring out the real issue
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index e3ac9eb7d5..3644fde3bb 100644
+index 49cf680b8e..77bdb1db77 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1550,7 +1550,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -19,10 +19,10 @@ index e3ac9eb7d5..3644fde3bb 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 552f1355ce..dc1f4f4e11 100644
+index 0993f60e20..d7469cc547 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2516,7 +2516,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2520,7 +2520,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
      }
  
      public final boolean isDisconnected() {
@@ -32,5 +32,5 @@ index 552f1355ce..dc1f4f4e11 100644
      // CraftBukkit end
  }
 -- 
-2.19.0
+2.19.1
 
diff --git a/Spigot-Server-Patches/0177-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/Spigot-Server-Patches/0177-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
index 537096295b..6bab2d92c7 100644
--- a/Spigot-Server-Patches/0177-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/Spigot-Server-Patches/0177-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
@@ -1,4 +1,4 @@
-From 8c1fd5cc02bce2bb212187855617f4cd6798d566 Mon Sep 17 00:00:00 2001
+From 93ba4596484722bd10c1bc3d91bc25698415794d Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Tue, 16 May 2017 21:29:08 -0500
 Subject: [PATCH] Add option to make parrots stay on shoulders despite movement
@@ -26,7 +26,7 @@ index 02d99aec43..3507997fc3 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index ad9e7f7b54..0f00eecead 100644
+index 09d2cd5716..b7a55b4d64 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -469,7 +469,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -39,10 +39,10 @@ index ad9e7f7b54..0f00eecead 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 5f1d9cd40e..f34613fb25 100644
+index 7ed26f6bf0..3289ba3ffd 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1758,6 +1758,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1762,6 +1762,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
          switch (packetplayinentityaction.c()) {
          case START_SNEAKING:
              this.player.setSneaking(true);
@@ -57,5 +57,5 @@ index 5f1d9cd40e..f34613fb25 100644
  
          case STOP_SNEAKING:
 -- 
-2.19.0
+2.19.1
 
diff --git a/Spigot-Server-Patches/0208-handle-PacketPlayInKeepAlive-async.patch b/Spigot-Server-Patches/0208-handle-PacketPlayInKeepAlive-async.patch
index 35031a383b..c85d28ab2b 100644
--- a/Spigot-Server-Patches/0208-handle-PacketPlayInKeepAlive-async.patch
+++ b/Spigot-Server-Patches/0208-handle-PacketPlayInKeepAlive-async.patch
@@ -1,4 +1,4 @@
-From 850d1a94bd4ad1eb9df199a1ed4f717d21e13dfd Mon Sep 17 00:00:00 2001
+From 8afa659bd6882b7c357345a3763d63a232f1198e Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 Date: Thu, 5 Oct 2017 01:54:07 +0100
 Subject: [PATCH] handle PacketPlayInKeepAlive async
@@ -15,10 +15,10 @@ also adding some additional logging in order to help work out what is causing
 random disconnections for clients.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index c12487b024..35a98bde1c 100644
+index b54da4eb79..bd2693536d 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2482,14 +2482,18 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2486,14 +2486,18 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
      }
  
      public void a(PacketPlayInKeepAlive packetplayinkeepalive) {
@@ -40,5 +40,5 @@ index c12487b024..35a98bde1c 100644
  
      }
 -- 
-2.19.0
+2.19.1
 
diff --git a/Spigot-Server-Patches/0252-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/Spigot-Server-Patches/0252-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
index fdf00ffcdd..dba1078fa3 100644
--- a/Spigot-Server-Patches/0252-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
+++ b/Spigot-Server-Patches/0252-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
@@ -1,14 +1,14 @@
-From 7ecdd7ff4e17135f5184695dcde3abb7017b6ea7 Mon Sep 17 00:00:00 2001
+From c3349109bd2f5aa374f6dee2e323468e8e79b481 Mon Sep 17 00:00:00 2001
 From: 0x22 <[email protected]>
 Date: Thu, 26 Apr 2018 04:41:11 -0400
 Subject: [PATCH] Fix exploit that allowed colored signs to be created
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index d44ac990b4..da32ed7a01 100644
+index 3c9948a2d6..5bbd09aa77 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2495,7 +2495,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2499,7 +2499,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
              String[] lines = new String[4];
  
              for (int i = 0; i < astring.length; ++i) {
@@ -18,5 +18,5 @@ index d44ac990b4..da32ed7a01 100644
              SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.server.getPlayer(this.player), lines);
              this.server.getPluginManager().callEvent(event);
 -- 
-2.19.0
+2.19.1
 
diff --git a/Spigot-Server-Patches/0282-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0282-InventoryCloseEvent-Reason-API.patch
index 711044a550..ac0f957747 100644
--- a/Spigot-Server-Patches/0282-InventoryCloseEvent-Reason-API.patch
+++ b/Spigot-Server-Patches/0282-InventoryCloseEvent-Reason-API.patch
@@ -1,4 +1,4 @@
-From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
+From 4d3b6af3a8a4102f3921f0874cccfc0b89602fe8 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 3 Jul 2018 21:56:23 -0400
 Subject: [PATCH] InventoryCloseEvent Reason API
@@ -7,7 +7,7 @@ Allows you to determine why an inventory was closed, enabling plugin developers
 to "confirm" things based on if it was player triggered close or not.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 44f37f50a7..864691f873 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -931,7 +931,7 @@ public class Chunk implements IChunkAccess {
@@ -29,7 +29,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
                      }
                  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 09064fa05d..125b8ef340 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -162,7 +162,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -56,7 +56,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
          this.activeContainer = this.defaultContainer;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 77bdb1db77..8901ea8e46 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -346,7 +346,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -110,10 +110,10 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
          this.m();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 5bbd09aa77..fc4c1e1bf5 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2031,7 +2031,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2035,7 +2035,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
          PlayerConnectionUtils.ensureMainThread(packetplayinclosewindow, this, this.player.getWorldServer());
  
          if (this.player.isFrozen()) return; // CraftBukkit
@@ -123,7 +123,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
          this.player.m();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index f97b5b8af0..813f6d1fd3 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -423,7 +423,7 @@ public abstract class PlayerList {
@@ -136,7 +136,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
          PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(cserver.getPlayer(entityplayer), "\u00A7e" + entityplayer.getName() + " left the game");
          cserver.getPluginManager().callEvent(playerQuitEvent);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 7070917547..c9cbf69798 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -417,8 +417,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -155,7 +155,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
      public boolean isBlocking() {
          return getHandle().isBlocking();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 5443000bdf..a0c0c96a28 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -740,7 +740,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -168,7 +168,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
  
          // Check if the fromWorld and toWorld are the same.
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index c11cc55154..138c61f56e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -941,8 +941,19 @@ public class CraftEventFactory {
diff --git a/Spigot-Server-Patches/0286-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/Spigot-Server-Patches/0286-Refresh-player-inventory-when-cancelling-PlayerInter.patch
index 6180a7c6b1..e3af3fbbc3 100644
--- a/Spigot-Server-Patches/0286-Refresh-player-inventory-when-cancelling-PlayerInter.patch
+++ b/Spigot-Server-Patches/0286-Refresh-player-inventory-when-cancelling-PlayerInter.patch
@@ -1,4 +1,4 @@
-From 0b0c51426d946c84f67f99076f3e60271d86bbf2 Mon Sep 17 00:00:00 2001
+From 5250252b9f15c326b4d6afb033459999ef065040 Mon Sep 17 00:00:00 2001
 From: Minecrell <[email protected]>
 Date: Fri, 13 Jul 2018 14:54:43 +0200
 Subject: [PATCH] Refresh player inventory when cancelling
@@ -16,10 +16,10 @@ Refresh the player inventory when PlayerInteractEntityEvent is
 cancelled to avoid this problem.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 9819bc0576..05b5e23bf3 100644
+index fc4c1e1bf5..f7c6ead3ae 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1945,6 +1945,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1949,6 +1949,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                      }
  
                      if (event.isCancelled()) {
@@ -28,5 +28,5 @@ index 9819bc0576..05b5e23bf3 100644
                      }
                      // CraftBukkit end
 -- 
-2.19.0
+2.19.1