SPIGOT-6682: Blocking with shield not reset after die

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);