From aa255689c1e00b77b066440bbfd2d84b641bfd58 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 24 Mar 2018 16:13:17 +1100
Subject: [PATCH] SPIGOT-3869: More resurrect fixes

---
 nms-patches/EntityLiving.patch | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/nms-patches/EntityLiving.patch b/nms-patches/EntityLiving.patch
index f39e620fa3..72d5cdccba 100644
--- a/nms-patches/EntityLiving.patch
+++ b/nms-patches/EntityLiving.patch
@@ -326,7 +326,7 @@
                  this.aA = 0.0F;
                  Entity entity1 = damagesource.getEntity();
  
-@@ -833,18 +981,28 @@
+@@ -833,19 +981,29 @@
              EnumHand[] aenumhand = EnumHand.values();
              int i = aenumhand.length;
  
@@ -346,6 +346,7 @@
              }
  
 -            if (itemstack != null) {
+-                if (this instanceof EntityPlayer) {
 +            EntityResurrectEvent event = new EntityResurrectEvent((LivingEntity) this.getBukkitEntity());
 +            event.setCancelled(itemstack == null);
 +            this.world.getServer().getPluginManager().callEvent(event);
@@ -354,10 +355,11 @@
 +                if (!itemstack1.isEmpty()) {
 +                    itemstack1.subtract(1);
 +                }
-+                // CraftBukkit end
-                 if (this instanceof EntityPlayer) {
++                if (itemstack != null && this instanceof EntityPlayer) {
++                    // CraftBukkit end
                      EntityPlayer entityplayer = (EntityPlayer) this;
  
+                     entityplayer.b(StatisticList.b(Items.cY));
 @@ -859,7 +1017,7 @@
                  this.world.broadcastEntityEffect(this, (byte) 35);
              }