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

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

Browse Source
This commit is contained in:
Light2
2014-03-28 02:23:18 +01:00
parent eece94c7cb ebe52b49aa
commit 4cd4c412af
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/combat/CombatService.java
+9 -3
View File
@@ -87,6 +87,8 @@ public class CombatService implements INetworkDispatch {
public void doCombat(final CreatureObject attacker, final TangibleObject target, final WeaponObject weapon, final CombatCommand command, final int actionCounter) {
if(target instanceof CreatureObject) if(((CreatureObject) target).getPosture() == Posture.Incapacitated || ((CreatureObject) target).getPosture() == Posture.Dead) return;
boolean success = true;
if((command.getAttackType() == 0 || command.getAttackType() == 1 || command.getAttackType() == 3) && !attemptCombat(attacker, target))
@@ -181,10 +183,14 @@ public class CombatService implements INetworkDispatch {
if(target instanceof CreatureObject)
{
if(((CreatureObject)(target)).getPosture() == Posture.Incapacitated)
CreatureObject creature = (CreatureObject)target;
if(creature.getPosture() == Posture.Incapacitated || creature.getPosture() == Posture.Dead)
{
attacker.removeDefender(target);
target.removeDefender(attacker);
for (TangibleObject defender : creature.getDefendersList())
{
defender.removeDefender(creature);
creature.removeDefender(defender);
}
}
}
}