MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

Template passed to method

Browse Source
This commit is contained in:
MagicBot
2024-03-16 17:46:49 -04:00
parent 288c941d69
commit 023fd547fd
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/mobileAI/utilities/CombatUtilities.java
+5 -2
View File
@@ -201,6 +201,8 @@ public class CombatUtilities {
public static void combatCycle(Mob agent, AbstractWorldObject target, boolean mainHand, ItemBase wb) { public static void combatCycle(Mob agent, AbstractWorldObject target, boolean mainHand, ItemBase wb) {
ItemTemplate template = ItemTemplate.templates.get(wb.getUUID());
if (!agent.isAlive() || !target.isAlive()) if (!agent.isAlive() || !target.isAlive())
return; return;
@@ -221,7 +223,7 @@ public class CombatUtilities {
if (agent.isSiege()) if (agent.isSiege())
dt = SourceType.SIEGE; dt = SourceType.SIEGE;
if (wb != null) { if (wb != null) {
anim = CombatManager.getSwingAnimation(wb, null, mainHand); anim = CombatManager.getSwingAnimation(template, null, mainHand);
dt = wb.getDamageType(); dt = wb.getDamageType();
} else if (!mainHand) } else if (!mainHand)
return; return;
@@ -250,7 +252,8 @@ public class CombatUtilities {
if (res != null && (res.immuneToAll() || res.immuneToAttacks() || res.immuneTo(dt))) if (res != null && (res.immuneToAll() || res.immuneToAttacks() || res.immuneTo(dt)))
return; return;
int passiveAnim = CombatManager.getSwingAnimation(wb, null, mainHand); int passiveAnim = CombatManager.getSwingAnimation(template, null, mainHand);
if (canSwing(agent)) { if (canSwing(agent)) {
if (triggerDefense(agent, target)) { if (triggerDefense(agent, target)) {
swingIsMiss(agent, target, passiveAnim); swingIsMiss(agent, target, passiveAnim);