projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-08-02 03:15:52 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

Browse Source
This commit is contained in:
Waverunner
2014-03-29 20:08:29 -04:00
parent f6bf134bad 2568c94b9a
commit 235ee34056
3 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/combat/CombatService.java
+9 -1
View File
@@ -193,7 +193,15 @@ public class CombatService implements INetworkDispatch {
creature.removeDefender(defender);
}
}
}
}
else if(target instanceof TangibleObject)
{
if(target.getConditionDamage() == target.getMaxDamage())
{
for(TangibleObject defender : target.getDefendersList()) defender.removeDefender(target);
core.objectService.destroyObject(target);
}
}
}
private void doAreaCombat(CreatureObject attacker, TangibleObject target, WeaponObject weapon, CombatCommand command, int actionCounter) {