From 1ce76170e2b3eb4dc2b332068e23a106991eac4f Mon Sep 17 00:00:00 2001 From: emu Date: Thu, 4 Apr 2024 12:42:06 +0100 Subject: [PATCH 1/3] 345 - spec pvp timings fix --- .../java/com/rs2/game/content/combat/CombatAssistant.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/2006Scape Server/src/main/java/com/rs2/game/content/combat/CombatAssistant.java b/2006Scape Server/src/main/java/com/rs2/game/content/combat/CombatAssistant.java index 91377b7c1..fe20b835e 100644 --- a/2006Scape Server/src/main/java/com/rs2/game/content/combat/CombatAssistant.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/combat/CombatAssistant.java @@ -30,6 +30,8 @@ import com.rs2.world.Boundary; import com.rs2.world.clip.PathFinder; +import static com.rs2.game.content.StaticItemList.GRANITE_MAUL; + /** * @author whoever contributed * @author Andrew (Mr Extremez) @@ -938,6 +940,10 @@ public void attackPlayer(int i) { player.lastArrowUsed = player.playerEquipment[player.playerArrows]; player.getSpecials().activateSpecial(player.playerEquipment[player.playerWeapon], o, i); player.followId = player.playerIndex; + // We can create a list if there are more than one weapon which does not trigger this + if(player.playerWeapon != GRANITE_MAUL){ + player.attackTimer = getAttackDelay(); + } return; } else { player.getPacketSender().sendMessage("You don't have the required special energy to use this attack."); From 0789b5d1a12d271f64781e4a5b9923fafb10bc7b Mon Sep 17 00:00:00 2001 From: Josh Shippam Date: Sun, 8 Dec 2024 01:48:45 +0000 Subject: [PATCH 2/3] Update CombatAssistant.java Import staticitemlist.* instead as we'll be using it for other stuff in this file --- .../main/java/com/rs2/game/content/combat/CombatAssistant.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/2006Scape Server/src/main/java/com/rs2/game/content/combat/CombatAssistant.java b/2006Scape Server/src/main/java/com/rs2/game/content/combat/CombatAssistant.java index fe20b835e..3b694685c 100644 --- a/2006Scape Server/src/main/java/com/rs2/game/content/combat/CombatAssistant.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/combat/CombatAssistant.java @@ -30,7 +30,7 @@ import com.rs2.world.Boundary; import com.rs2.world.clip.PathFinder; -import static com.rs2.game.content.StaticItemList.GRANITE_MAUL; +import static com.rs2.game.content.StaticItemList.*; /** * @author whoever contributed From 9e5fec37b2083275a538b956c5c7ffb4fc99ed4e Mon Sep 17 00:00:00 2001 From: Josh Shippam Date: Sun, 8 Dec 2024 02:03:26 +0000 Subject: [PATCH 3/3] Update CombatAssistant.java --- .../main/java/com/rs2/game/content/combat/CombatAssistant.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/2006Scape Server/src/main/java/com/rs2/game/content/combat/CombatAssistant.java b/2006Scape Server/src/main/java/com/rs2/game/content/combat/CombatAssistant.java index 43795e289..6f01a449a 100644 --- a/2006Scape Server/src/main/java/com/rs2/game/content/combat/CombatAssistant.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/combat/CombatAssistant.java @@ -956,7 +956,7 @@ public void attackPlayer(int i) { player.followPlayerId = player.playerIndex; // We can create a list if there are more than one weapon which does not trigger this - if(player.playerWeapon != GRANITE_MAUL){ + if(player.playerWeapon != StaticItemList.GRANITE_MAUL){ player.attackTimer = getAttackDelay(); }