projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-10 00:13:05 -04:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into CreatureObjectRefactor

Browse Source 
Conflicts:
	src/resources/objects/creature/CreatureMessageBuilder.java
	src/resources/objects/creature/CreatureObject.java
	src/services/PlayerService.java
	src/services/ai/AIActor.java
	src/services/ai/states/AttackState.java
This commit is contained in:
Treeku
2014-08-16 22:19:19 +01:00
parent 0175a6716e 9f1e473984
commit e5d4a633bf
493 changed files with 15144 additions and 2438 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/ai/LairActor.java
+3 -3
View File
@@ -33,6 +33,7 @@ import resources.objects.tangible.TangibleObject;
import services.combat.CombatEvents.DamageTaken;
import tools.DevLog;
@SuppressWarnings("unused")
public class LairActor {
private Vector<AIActor> creatures = new Vector<AIActor>();
@@ -86,8 +87,8 @@ public class LairActor {
spawnNewCreatures();
for(AIActor ai : creatures) {
ai.addDefender(event.attacker);
event.attacker.addDefender(ai.getCreature());
ai.addDefender((CreatureObject)event.attacker);
((CreatureObject)event.attacker).addDefender(ai.getCreature());
}
@@ -163,7 +164,6 @@ public class LairActor {
}
@SuppressWarnings("unused")
private void healLair() {
if(lairObject.getConditionDamage() == 0 || creatures.isEmpty())