mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-23 02:55:47 +01:00
4104545b11
"It was from a different time before books were as jank as they are now. As time has gone on they've only proven to be worse and worse."
43 lines
1.6 KiB
Diff
43 lines
1.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
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 d9f06a7ff7c6b4c60ddbc5d7131916fabd0fc4d2..0aec2e79d053b6cb845ffea393ad431b3d254b83 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
@@ -722,5 +722,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
|
|
}
|