From fd33bcee19e95e6a6e2c6400c68febdc0e3f6125 Mon Sep 17 00:00:00 2001
From: Anrza <andrzejrzeczycki314@gmail.com>
Date: Wed, 15 Jul 2020 12:11:31 +0200
Subject: [PATCH] Add LivingEntity#clearActiveItem

---
 ...237-Add-LivingEntity-clearActiveItem.patch | 24 +++++++++++++++++++
 ...605-Add-LivingEntity-clearActiveItem.patch | 24 +++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 Spigot-API-Patches/0237-Add-LivingEntity-clearActiveItem.patch
 create mode 100644 Spigot-Server-Patches/0605-Add-LivingEntity-clearActiveItem.patch

diff --git a/Spigot-API-Patches/0237-Add-LivingEntity-clearActiveItem.patch b/Spigot-API-Patches/0237-Add-LivingEntity-clearActiveItem.patch
new file mode 100644
index 000000000..bb5b5e0b5
--- /dev/null
+++ b/Spigot-API-Patches/0237-Add-LivingEntity-clearActiveItem.patch
@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Anrza <andrzejrzeczycki314@gmail.com>
+Date: Wed, 15 Jul 2020 12:07:58 +0200
+Subject: [PATCH] Add LivingEntity#clearActiveItem
+
+
+diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
+index 9bf525b795ff1d88d2596b1f2bc787ce0df047bb..e535750d01a6c1bf4b1fe94df518166213da9b08 100644
+--- a/src/main/java/org/bukkit/entity/LivingEntity.java
++++ b/src/main/java/org/bukkit/entity/LivingEntity.java
+@@ -766,6 +766,13 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+     @Nullable
+     ItemStack getActiveItem();
+ 
++    // Paper start
++    /**
++     * Interrupts any ongoing active "usage" or consumption or an item.
++     */
++    void clearActiveItem();
++    // Paper end
++
+     /**
+      * Get's remaining time a player needs to keep hands raised with an item to finish using it.
+      * @return Remaining ticks to use the item
diff --git a/Spigot-Server-Patches/0605-Add-LivingEntity-clearActiveItem.patch b/Spigot-Server-Patches/0605-Add-LivingEntity-clearActiveItem.patch
new file mode 100644
index 000000000..7d0dc8916
--- /dev/null
+++ b/Spigot-Server-Patches/0605-Add-LivingEntity-clearActiveItem.patch
@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Anrza <andrzejrzeczycki314@gmail.com>
+Date: Wed, 15 Jul 2020 12:08:49 +0200
+Subject: [PATCH] Add LivingEntity#clearActiveItem
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+index 9e9bdf9bc2e5c4d72d811fcb439628d946741324..1fc356d0b74c1cbb19bf7527088f1f61b6da5422 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+@@ -775,6 +775,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+         return getHandle().activeItem.asBukkitMirror();
+     }
+ 
++    // Paper start
++    @Override
++    public void clearActiveItem() {
++        getHandle().clearActiveItem();
++    }
++    // Paper end
++
+     @Override
+     public int getItemUseRemainingTime() {
+         return getHandle().getItemUseRemainingTime();