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-04-06 16:30:14 -04:00
parent 438c960d88 25eefbd989
commit cc1ce8bf2c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/ai/AIActor.java
-1
View File
@@ -237,7 +237,6 @@ public class AIActor {
case StateResult.DEAD:
setCurrentState(new DeathState());
case StateResult.FINISHED:
// TODO: add state transitions
case StateResult.UNFINISHED:
return;
case StateResult.IDLE:
src/services/ai/states/AttackState.java
+2 -1
View File
@@ -120,6 +120,7 @@ public class AttackState extends AIState {
creature.setLookAtTarget(0);
creature.setIntendedTarget(0);
actor.setFollowObject(null);
actor.setCurrentState(new RetreatState());
return StateResult.FINISHED;
}
CreatureObject target = actor.getFollowObject();
@@ -133,7 +134,7 @@ public class AttackState extends AIState {
return StateResult.UNFINISHED;
}
if(target.getPosture() == 13 || target.getPosture() == 14) {
actor.getDamageMap().remove(target);
actor.removeDefender(target);
actor.setFollowObject(actor.getHighestDamageDealer());
target = actor.getFollowObject();
if(target == null)