From 6eba58c9592025e5cfd336803e9b43cf2f2dc97d Mon Sep 17 00:00:00 2001 From: ssyo <47333239+yutaoz@users.noreply.github.com> Date: Mon, 17 Jun 2024 17:56:38 -0400 Subject: [PATCH] Accounted for mace in autosword hack, added bonus damage from falling with mace. --- .../java/net/wurstclient/hacks/AutoSwordHack.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/wurstclient/hacks/AutoSwordHack.java b/src/main/java/net/wurstclient/hacks/AutoSwordHack.java index 40deb7d3..fa64bd9f 100644 --- a/src/main/java/net/wurstclient/hacks/AutoSwordHack.java +++ b/src/main/java/net/wurstclient/hacks/AutoSwordHack.java @@ -14,6 +14,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ToolItem; import net.minecraft.item.TridentItem; +import net.minecraft.item.MaceItem; import net.minecraft.util.hit.EntityHitResult; import net.minecraft.util.hit.HitResult; import net.wurstclient.Category; @@ -144,7 +145,8 @@ public final class AutoSwordHack extends Hack implements UpdateListener private float getValue(ItemStack stack, Entity entity) { Item item = stack.getItem(); - if(!(item instanceof ToolItem || item instanceof TridentItem)) + if(!(item instanceof ToolItem || item instanceof TridentItem + || item instanceof MaceItem)) return Integer.MIN_VALUE; switch(priority.getSelected()) @@ -161,6 +163,13 @@ public final class AutoSwordHack extends Hack implements UpdateListener float dmg = (float)ItemUtils .getAttribute(item, EntityAttributes.GENERIC_ATTACK_DAMAGE) .orElseThrow(); + + // Check for mace, get bonus damage from fall + if(item instanceof MaceItem) + { + dmg = ((MaceItem)item).getBonusAttackDamage(MC.player, dmg, + entity.getDamageSources().playerAttack(MC.player)); + } // dmg += EnchantmentHelper.getAttackDamage(stack, group); return dmg; }