Update upstream

Spigot-API-Patches/0019-Add-methods-for-working-with-arrows-stuck-in-living-.patch

@@ -1,14 +1,14 @@
-From a2e517e59ee21c1ce489f3917b75bcb8a94d1bea Mon Sep 17 00:00:00 2001
+From f912ec5fe389be95c107a38794a22f0544bd5e1e Mon Sep 17 00:00:00 2001
 From: mrapple <tony@oc.tc>
 Date: Sun, 25 Nov 2012 13:47:27 -0600
 Subject: [PATCH] Add methods for working with arrows stuck in living entities
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 97c2172b..f6ae0a6d 100644
+index 9e05f9138..3309053ac 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -376,4 +376,19 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
+@@ -385,4 +385,19 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
       * @return collision status
       */
      boolean isCollidable();

Spigot-API-Patches/0108-Make-shield-blocking-delay-configurable.patch

@@ -1,14 +1,14 @@
-From 047d17dce86b980dda8c0c0ec7220d90c321cd92 Mon Sep 17 00:00:00 2001
+From 9063aa95f7e636b7ac6f7ef498185e41deeaa694 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 16 Jun 2018 01:17:39 -0500
 Subject: [PATCH] Make shield blocking delay configurable
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 700ed29f..7ea7ccf0 100644
+index 4acd568d0..932cc249a 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -401,5 +401,19 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
+@@ -410,5 +410,19 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
       * @param arrows Number of arrows to stick in this entity
       */
      void setArrowsStuck(int arrows);

Spigot-API-Patches/0115-LivingEntity-Hand-Raised-Item-Use-API.patch

@@ -1,4 +1,4 @@
-From 04b67e12230f3c0feea220732944b891d5ca71c2 Mon Sep 17 00:00:00 2001
+From 8757596345acf71f866fa9a83409b08686cbe0a1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 29 Jun 2018 00:19:19 -0400
 Subject: [PATCH] LivingEntity Hand Raised/Item Use API
@@ -6,7 +6,7 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API
 How long an entity has raised hands to charge an attack or use an item
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 7ea7ccf0..fea831e6 100644
+index 932cc249a..4b7a19d31 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -10,6 +10,7 @@ import org.bukkit.Material;
@@ -17,7 +17,7 @@ index 7ea7ccf0..fea831e6 100644
  import org.bukkit.potion.PotionEffect;
  import org.bukkit.potion.PotionEffectType;
  import org.bukkit.projectiles.ProjectileSource;
-@@ -415,5 +416,27 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
+@@ -424,5 +425,27 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
       * @param delay Delay in ticks
       */
      void setShieldBlockingDelay(int delay);

Spigot-Server-Patches/0060-Add-methods-for-working-with-arrows-stuck-in-living-.patch

@@ -1,14 +1,14 @@
-From 268f500c4d2b68c8a7a6e967496e1bf6b9479eee Mon Sep 17 00:00:00 2001
+From 1732eed30441f263fee9c251e84341f0c7fdebf9 Mon Sep 17 00:00:00 2001
 From: mrapple <tony@oc.tc>
 Date: Sun, 25 Nov 2012 13:43:39 -0600
 Subject: [PATCH] Add methods for working with arrows stuck in living entities
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 9079f5e903..b25ce0c58f 100644
+index 549205ecaa..ac301d379b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -507,4 +507,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -512,4 +512,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      public boolean isCollidable() {
          return getHandle().collides;
      }

Spigot-Server-Patches/0191-Shoulder-Entities-Release-API.patch

@@ -1,11 +1,11 @@
-From a7caf052e8586f81c16f32cebf9ceb38ee599153 Mon Sep 17 00:00:00 2001
+From c4c29f13492aa4c90973421cb6a7fd7697e37994 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 17 Jun 2017 15:18:30 -0400
 Subject: [PATCH] Shoulder Entities Release API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 42c6249535..b20cab58b1 100644
+index 814202286c..d9f81e6348 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1819,21 +1819,48 @@ public abstract class EntityHuman extends EntityLiving {
@@ -62,10 +62,10 @@ index 42c6249535..b20cab58b1 100644
      public abstract boolean isSpectator();
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index d96c6afdb3..e06ac23852 100644
+index cce9366f4d..4afff2f262 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-@@ -454,6 +454,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
+@@ -455,6 +455,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
          getHandle().getCooldownTracker().a(CraftMagicNumbers.getItem(material), ticks);
      }
  

Spigot-Server-Patches/0254-Add-method-to-open-already-placed-sign.patch

@@ -1,14 +1,14 @@
-From 846943696efc9b1ccacf885d7badf1dc90addfdc Mon Sep 17 00:00:00 2001
+From d5e4178fb083c3010357aa2faa32dcf4cbb5e0d2 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Sun, 1 Apr 2018 02:29:37 +0300
 Subject: [PATCH] Add method to open already placed sign
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index e06ac23852..6f1659b221 100644
+index 4afff2f262..e9707dfa74 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-@@ -517,4 +517,17 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
+@@ -518,4 +518,17 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
              entity.remove();
          }
      }

Spigot-Server-Patches/0275-Make-shield-blocking-delay-configurable.patch

@@ -1,4 +1,4 @@
-From 30427ff32f5721e52b627144cc6ef04a04a06954 Mon Sep 17 00:00:00 2001
+From a6d780b52c0bbbc8a4b8354539498b66f5793ebe Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 16 Jun 2018 01:18:16 -0500
 Subject: [PATCH] Make shield blocking delay configurable
@@ -49,10 +49,10 @@ index 999a02cad3..eaab10a146 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 71b9b45f10..d7344809ec 100644
+index 49f515d868..fab1af7159 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -528,5 +528,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -533,5 +533,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      public void setArrowsStuck(int arrows) {
          getHandle().setArrowCount(arrows);
      }

Spigot-Server-Patches/0282-LivingEntity-Hand-Raised-Item-Use-API.patch

@@ -1,4 +1,4 @@
-From f29840c3c49b3e5d1441e230900c9f18e47e8571 Mon Sep 17 00:00:00 2001
+From b6c38b7516051162057b747eb2cd7af52d49bd86 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 29 Jun 2018 00:21:28 -0400
 Subject: [PATCH] LivingEntity Hand Raised/Item Use API
@@ -32,10 +32,10 @@ index 4455dc4891..8be1ba5269 100644
          return this.isHandRaised() ? this.activeItem.k() - this.cX() : 0;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index d7344809ec..e199d08377 100644
+index fab1af7159..71e0da894b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -538,5 +538,25 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -543,5 +543,25 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      public void setShieldBlockingDelay(int delay) {
          getHandle().setShieldBlockingDelay(delay);
      }

Spigot-Server-Patches/0288-InventoryCloseEvent-Reason-API.patch

@@ -1,4 +1,4 @@
-From 7b6fefc4f1fbcb78813a93ca4798d0d2e53520bc Mon Sep 17 00:00:00 2001
+From 774190c57320a6ef813fa2b05cb4a728f8ff7a2f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 3 Jul 2018 21:56:23 -0400
 Subject: [PATCH] InventoryCloseEvent Reason API
@@ -29,7 +29,7 @@ index f6beb6886d..d2e87693fa 100644
                      }
                  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 738ac8570c..14a61f68e1 100644
+index 015cd553dd..f7588c4d44 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -153,7 +153,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -110,7 +110,7 @@ index 9b1edab77d..8fd7a0d029 100644
          this.m();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 7bf99cae1b..5ffc4fccd0 100644
+index ce8170ea9f..da501a1c5f 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2040,7 +2040,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -136,10 +136,10 @@ index 45e42e9989..7a2b219c67 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 6f1659b221..26b30a1503 100644
+index e9707dfa74..a16bfc7f65 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-@@ -411,8 +411,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
+@@ -412,8 +412,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
      }
  
      public void closeInventory() {

work/Bukkit

@@ -1 +1 @@
-Subproject commit 61e81e7467cfd84c311509af20ae5dd7bbbc9aaf
+Subproject commit cab9d86f6ccc8399010c0eac9d7986f55b4d8f23

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit d474030e14d711ba29b83f3fff8e6c6dcf550a08
+Subproject commit 272426acd7cfb50978f478f49d835c8541da2a4e