From 89bdd859332c736c4fbf4dfc9815168fbf394919 Mon Sep 17 00:00:00 2001 From: Anrza Date: Wed, 15 Jul 2020 12:11:31 +0200 Subject: [PATCH] Add LivingEntity#clearActiveItem --- .../Add-LivingEntity-clearActiveItem.patch | 24 +++++++++++++++++++ .../Add-LivingEntity-clearActiveItem.patch | 24 +++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 Spigot-API-Patches/Add-LivingEntity-clearActiveItem.patch create mode 100644 Spigot-Server-Patches/Add-LivingEntity-clearActiveItem.patch diff --git a/Spigot-API-Patches/Add-LivingEntity-clearActiveItem.patch b/Spigot-API-Patches/Add-LivingEntity-clearActiveItem.patch new file mode 100644 index 0000000000..9c52dbc181 --- /dev/null +++ b/Spigot-API-Patches/Add-LivingEntity-clearActiveItem.patch @@ -0,0 +1,24 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Anrza +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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/src/main/java/org/bukkit/entity/LivingEntity.java ++++ b/src/main/java/org/bukkit/entity/LivingEntity.java +@@ -0,0 +0,0 @@ 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/Add-LivingEntity-clearActiveItem.patch b/Spigot-Server-Patches/Add-LivingEntity-clearActiveItem.patch new file mode 100644 index 0000000000..8d7c280205 --- /dev/null +++ b/Spigot-Server-Patches/Add-LivingEntity-clearActiveItem.patch @@ -0,0 +1,24 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Anrza +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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java ++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +@@ -0,0 +0,0 @@ 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();