aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0204-LivingEntity-Hand-Raised-Item-Use-API.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0204-LivingEntity-Hand-Raised-Item-Use-API.patch')
-rw-r--r--patches/server/0204-LivingEntity-Hand-Raised-Item-Use-API.patch42
1 files changed, 42 insertions, 0 deletions
diff --git a/patches/server/0204-LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/server/0204-LivingEntity-Hand-Raised-Item-Use-API.patch
new file mode 100644
index 0000000000..586af96db3
--- /dev/null
+++ b/patches/server/0204-LivingEntity-Hand-Raised-Item-Use-API.patch
@@ -0,0 +1,42 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <[email protected]>
+Date: Fri, 29 Jun 2018 00:21:28 -0400
+Subject: [PATCH] LivingEntity Hand Raised/Item Use API
+
+How long an entity has raised hands to charge an attack or use an item
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+index ca92ece290c6dd164b3ba2ba46289350ae6829e8..8ac3beab73904db7362caa3054994b214c997cf7 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+@@ -849,5 +849,30 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+ public void setShieldBlockingDelay(int delay) {
+ getHandle().setShieldBlockingDelay(delay);
+ }
++
++ @Override
++ public ItemStack getActiveItem() {
++ return getHandle().getUseItem().asBukkitMirror();
++ }
++
++ @Override
++ public int getItemUseRemainingTime() {
++ return getHandle().getUseItemRemainingTicks();
++ }
++
++ @Override
++ public int getHandRaisedTime() {
++ return getHandle().getTicksUsingItem();
++ }
++
++ @Override
++ public boolean isHandRaised() {
++ return getHandle().isUsingItem();
++ }
++
++ @Override
++ public org.bukkit.inventory.EquipmentSlot getHandRaised() {
++ return getHandle().getUsedItemHand() == net.minecraft.world.InteractionHand.MAIN_HAND ? org.bukkit.inventory.EquipmentSlot.HAND : org.bukkit.inventory.EquipmentSlot.OFF_HAND;
++ }
+ // Paper end
+ }