2006-Scape/2006Scape
1
0
Fork 0
mirror of https://github.com/2006-Scape/2006Scape.git synced 2026-07-02 16:49:03 +00:00
Code Issues 4.5k Packages Projects Releases 10 Wiki Activity

Fix Darks Mistakes (#580)

Browse Source 
Co-authored-by: MatthewBishop <55411296+matthewbishop@users.noreply.github.com>
This commit is contained in:
Josh Shippam
2023-02-04 07:02:44 +00:00
committed by GitHub
parent 42727bde11
commit 1a2a7e2b9b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Scape Server/src/main/java/com/rs2/game/content/combat/melee/MeleeData.java
+3 -3
View File
@@ -400,6 +400,9 @@ public class MeleeData {
* Block emotes * Block emotes
*/ */
public static int getBlockEmote(Player c) { 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 weaponName = ItemAssistant.getItemName(c.playerEquipment[ItemConstants.WEAPON]).toLowerCase();
String shieldName = ItemAssistant.getItemName(c.playerEquipment[ItemConstants.SHIELD]).toLowerCase(); String shieldName = ItemAssistant.getItemName(c.playerEquipment[ItemConstants.SHIELD]).toLowerCase();
if (c.playerEquipment[c.playerShield] >= 8844 if (c.playerEquipment[c.playerShield] >= 8844
@@ -410,9 +413,6 @@ public class MeleeData {
return 1156; return 1156;
if (weaponName.contains("staff")) if (weaponName.contains("staff"))
return 420; return 420;
MonkeyData data = MonkeyData.forId(c.playerEquipment[ItemConstants.WEAPON]);
if (data != null)
return data.getBlockAnim();
switch (c.playerEquipment[c.playerWeapon]) { switch (c.playerEquipment[c.playerWeapon]) {
case -1: case -1:
case 0: case 0: