From ac99d7d47480adf589a661f00a4acf0879f48ed7 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 20 Nov 2016 14:13:21 +1100
Subject: [PATCH] SPIGOT-2807: Update inventory when attack cancelled

---
 nms-patches/EntityHuman.patch | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/nms-patches/EntityHuman.patch b/nms-patches/EntityHuman.patch
index d0e1cf9490..19bc4b5fd4 100644
--- a/nms-patches/EntityHuman.patch
+++ b/nms-patches/EntityHuman.patch
@@ -332,7 +332,19 @@
                              }
  
                              if (this.world instanceof WorldServer && f4 > 2.0F) {
-@@ -1118,6 +1243,20 @@
+@@ -1028,6 +1153,11 @@
+                         if (flag4) {
+                             entity.extinguish();
+                         }
++                        // CraftBukkit start - resync on cancelled event
++                        if (this instanceof EntityPlayer) {
++                            ((EntityPlayer) this).getBukkitEntity().updateInventory();
++                        }
++                        // CraftBukkit end
+                     }
+                 }
+ 
+@@ -1118,6 +1248,20 @@
              this.stopRiding();
          }
  
@@ -353,7 +365,7 @@
          this.setSize(0.2F, 0.2F);
          if (this.world.isLoaded(blockposition)) {
              float f = 0.5F + (float) enumdirection.getAdjacentX() * 0.4F;
-@@ -1177,6 +1316,23 @@
+@@ -1177,6 +1321,23 @@
              this.world.everyoneSleeping();
          }
  
@@ -377,7 +389,7 @@
          this.sleepTicks = flag ? 0 : 100;
          if (flag2) {
              this.setRespawnPosition(this.bedPosition, false);
-@@ -1228,9 +1384,11 @@
+@@ -1228,9 +1389,11 @@
          if (blockposition != null) {
              this.e = blockposition;
              this.f = flag;