Azimkin/CraftBukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move getItemInUse up to LivingEntity

Browse Source
This commit is contained in:
md_5 2024-03-30 12:54:26 +11:00
parent 668e09602c
commit 51bbab2b9f
No known key found for this signature in database
GPG Key ID: E8E901AC7C617C11
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
View File

@ -456,12 +456,6 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
return getHandle().isUsingItem(); return getHandle().isUsingItem();
} }
@Override
public ItemStack getItemInUse() {
net.minecraft.world.item.ItemStack item = getHandle().getUseItem();
return item.isEmpty() ? null : CraftItemStack.asCraftMirror(item);
}
@Override @Override
public boolean setWindowProperty(InventoryView.Property prop, int value) { public boolean setWindowProperty(InventoryView.Property prop, int value) {
return false; return false;

6
src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
View File

@ -258,6 +258,12 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
getHandle().maxAirTicks = ticks; getHandle().maxAirTicks = ticks;
} }
@Override
public ItemStack getItemInUse() {
net.minecraft.world.item.ItemStack item = getHandle().getUseItem();
return item.isEmpty() ? null : CraftItemStack.asCraftMirror(item);
}
@Override @Override
public int getItemInUseTicks() { public int getItemInUseTicks() {
return getHandle().getUseItemRemainingTicks(); return getHandle().getUseItemRemainingTicks();