BadBird/BattleBane
1
0
Fork 0
forked from MagicBane/Server
Code Issues 1 Pull Requests Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
FatBoy-DOTC
2023-03-01 13:31:35 -06:00
parent 5830a9ef82
commit cfd93f2ca0
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/ai/utilities/CombatUtilities.java
+8 -3
View File
@@ -295,7 +295,7 @@ public class CombatUtilities {
swingIsBlock(agent, target, passiveAnim); swingIsBlock(agent, target, passiveAnim);
return; return;
} }
swingIsDamage(agent,target, determineDamage(agent,target), anim); swingIsDamage(agent,target, determineDamage(agent), anim);
if (agent.getWeaponPower() != null) if (agent.getWeaponPower() != null)
agent.getWeaponPower().attack(target, MBServerStatics.ONE_MINUTE); agent.getWeaponPower().attack(target, MBServerStatics.ONE_MINUTE);
@@ -326,11 +326,16 @@ public class CombatUtilities {
} }
public static float determineDamage(Mob agent,AbstractWorldObject target) { public static float determineDamage(Mob agent) {
if(agent == null || target == null){ if(agent == null){
//early exit for null //early exit for null
return 0; return 0;
} }
AbstractWorldObject target = agent.getCombatTarget();
if(target == null){
//early exit for null target
return 0;
}
float damage = 0; float damage = 0;
DamageType dt = getDamageType(agent); DamageType dt = getDamageType(agent);
if(agent.isSummonedPet() == true || agent.isPet() == true || agent.isNecroPet() == true) { if(agent.isSummonedPet() == true || agent.isPet() == true || agent.isNecroPet() == true) {