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

Block anim fixes (#578)

Browse Source 
* Fix Shield & Staff Block Anims

* IntelliJ Code Format MeleeData.java
This commit is contained in:
Josh Shippam
2023-02-04 06:38:20 +00:00
committed by GitHub
parent c42dc29f73
commit f59e396359
1 changed files with 442 additions and 432 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
+10
View File
@@ -7,6 +7,8 @@ import com.rs2.game.items.ItemConstants;
import com.rs2.game.items.impl.Greegree.MonkeyData; import com.rs2.game.items.impl.Greegree.MonkeyData;
import com.rs2.game.players.Player; import com.rs2.game.players.Player;
import static com.rs2.game.content.StaticItemList.TOKTZKETXIL;
public class MeleeData { public class MeleeData {
public static boolean fullVoidMelee(Player c) { public static boolean fullVoidMelee(Player c) {
@@ -398,10 +400,16 @@ public class MeleeData {
* Block emotes * Block emotes
*/ */
public static int getBlockEmote(Player c) { public static int getBlockEmote(Player c) {
String weaponName = ItemAssistant.getItemName(c.playerEquipment[ItemConstants.WEAPON]).toLowerCase();
String shieldName = ItemAssistant.getItemName(c.playerEquipment[ItemConstants.SHIELD]).toLowerCase();
if (c.playerEquipment[c.playerShield] >= 8844 if (c.playerEquipment[c.playerShield] >= 8844
&& c.playerEquipment[c.playerShield] <= 8850) { && c.playerEquipment[c.playerShield] <= 8850) {
return 4177; return 4177;
} }
if (shieldName.contains("shield"))
return 1156;
if (weaponName.contains("staff"))
return 420;
MonkeyData data = MonkeyData.forId(c.playerEquipment[ItemConstants.WEAPON]); MonkeyData data = MonkeyData.forId(c.playerEquipment[ItemConstants.WEAPON]);
if (data != null) if (data != null)
return data.getBlockAnim(); return data.getBlockAnim();
@@ -424,6 +432,8 @@ public class MeleeData {
case 11696: case 11696:
case 11730: case 11730:
return -1; return -1;
case TOKTZKETXIL:
return 1156;
default: default:
return 404; return 404;
} }