From 1a2a7e2b9b129480da2f8419dcda7f2599480ecc Mon Sep 17 00:00:00 2001 From: Josh Shippam Date: Sat, 4 Feb 2023 07:02:44 +0000 Subject: [PATCH] Fix Darks Mistakes (#580) Co-authored-by: MatthewBishop <55411296+matthewbishop@users.noreply.github.com> --- .../java/com/rs2/game/content/combat/melee/MeleeData.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/2006Scape Server/src/main/java/com/rs2/game/content/combat/melee/MeleeData.java b/2006Scape Server/src/main/java/com/rs2/game/content/combat/melee/MeleeData.java index 57f564a1..870c3f4b 100644 --- a/2006Scape Server/src/main/java/com/rs2/game/content/combat/melee/MeleeData.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/combat/melee/MeleeData.java @@ -400,6 +400,9 @@ public class MeleeData { * Block emotes */ public static int getBlockEmote(Player c) { + MonkeyData data = MonkeyData.forId(c.playerEquipment[ItemConstants.WEAPON]); + if (data != null) + return data.getBlockAnim(); String weaponName = ItemAssistant.getItemName(c.playerEquipment[ItemConstants.WEAPON]).toLowerCase(); String shieldName = ItemAssistant.getItemName(c.playerEquipment[ItemConstants.SHIELD]).toLowerCase(); if (c.playerEquipment[c.playerShield] >= 8844 @@ -410,9 +413,6 @@ public class MeleeData { return 1156; if (weaponName.contains("staff")) return 420; - MonkeyData data = MonkeyData.forId(c.playerEquipment[ItemConstants.WEAPON]); - if (data != null) - return data.getBlockAnim(); switch (c.playerEquipment[c.playerWeapon]) { case -1: case 0: