From 8a206e8c92f39970176f6f92690de5cc5b410765 Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Fri, 4 Oct 2019 08:12:23 -0700 Subject: [PATCH] woodcutting: Add axe animation matching helper method --- .../java/net/runelite/client/plugins/woodcutting/Axe.java | 6 ++++++ .../client/plugins/woodcutting/WoodcuttingOverlay.java | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/Axe.java b/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/Axe.java index 4ad6d6e90f..24d7249a4d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/Axe.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/Axe.java @@ -50,6 +50,7 @@ import static net.runelite.api.ItemID.MITHRIL_AXE; import static net.runelite.api.ItemID.RUNE_AXE; import static net.runelite.api.ItemID.STEEL_AXE; import static net.runelite.api.ItemID._3RD_AGE_AXE; +import net.runelite.api.Player; @AllArgsConstructor @Getter @@ -84,6 +85,11 @@ enum Axe AXE_ANIM_IDS = builder.build(); } + boolean matchesChoppingAnimation(final Player player) + { + return player != null && animId == player.getAnimation(); + } + static Axe findAxeByAnimId(int animId) { return AXE_ANIM_IDS.get(animId); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingOverlay.java index 5aa6f0cde2..6f863cdda7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingOverlay.java @@ -81,7 +81,7 @@ class WoodcuttingOverlay extends Overlay panelComponent.getChildren().clear(); Axe axe = plugin.getAxe(); - if (axe != null && axe.getAnimId() == client.getLocalPlayer().getAnimation()) + if (axe != null && axe.matchesChoppingAnimation(client.getLocalPlayer())) { panelComponent.getChildren().add(TitleComponent.builder() .text("Woodcutting")