From e1c96e507f7019e30e353166645d6dbeaa6c1482 Mon Sep 17 00:00:00 2001
From: DerFrZocker <derrieple@gmail.com>
Date: Wed, 4 Aug 2021 17:09:09 +1000
Subject: [PATCH] SPIGOT-6682: Blocking with shield not reset after die

---
 nms-patches/net/minecraft/server/level/EntityPlayer.patch | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nms-patches/net/minecraft/server/level/EntityPlayer.patch b/nms-patches/net/minecraft/server/level/EntityPlayer.patch
index 85ca81556..f89e739c3 100644
--- a/nms-patches/net/minecraft/server/level/EntityPlayer.patch
+++ b/nms-patches/net/minecraft/server/level/EntityPlayer.patch
@@ -863,7 +863,7 @@
  
      }
  
-@@ -1634,4 +2020,144 @@
+@@ -1634,4 +2020,145 @@
          });
          return this.a(itemstack, false, true) != null;
      }
@@ -979,6 +979,7 @@
 +        }
 +
 +        this.setHealth(this.getMaxHealth());
++        this.clearActiveItem(); // CraftBukkit - SPIGOT-6682: Clear active item on reset
 +        this.remainingFireTicks = 0;
 +        this.fallDistance = 0;
 +        this.foodData = new FoodMetaData(this);