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

Refactored CreatureObject

Browse Source
This commit is contained in:
Treeku
2014-08-16 20:35:06 +01:00
parent 51c14284eb
commit 0175a6716e
23 changed files with 1769 additions and 2865 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/combat/CombatService.java
+7 -7
View File
@@ -323,8 +323,8 @@ public class CombatService implements INetworkDispatch {
if (target instanceof CreatureObject){
CreatureObject targetCreature = (CreatureObject)target;
if (targetCreature.getCalledPet()!=null) {
AIActor petActor = (AIActor) targetCreature.getCalledPet().getAttachment("AI");
if (core.objectService.getObject(targetCreature.getPlayerObject().getPet())!=null) {
AIActor petActor = (AIActor) core.objectService.getObject(targetCreature.getPlayerObject().getPet()).getAttachment("AI");
if (petActor!=null){
petActor.addDefender(attacker);
DevLog.debugout("Charon", "Pet AI", "applyDamage addDefender");
@@ -550,11 +550,11 @@ public class CombatService implements INetworkDispatch {
private boolean attemptCombat(CreatureObject attacker, TangibleObject target) {
if (attacker.isInStealth()) {
attacker.setInStealth(false);
if (attacker.isCloaked()) {
attacker.setCloaked(false);
if (attacker.getPlayerObject() != null && attacker.getPlayerObject().getProfession().equals("spy_1a")) {
attacker.setRadarVisible(true);
attacker.setVisibleOnRadar(true);
}
}
@@ -912,8 +912,8 @@ public class CombatService implements INetworkDispatch {
if (target instanceof CreatureObject){
CreatureObject targetCreature = (CreatureObject)target;
if (targetCreature.getCalledPet()!=null) {
AIActor petActor = (AIActor) targetCreature.getCalledPet().getAttachment("AI");
if (core.objectService.getObject(targetCreature.getPlayerObject().getPet())!=null) {
AIActor petActor = (AIActor) core.objectService.getObject(targetCreature.getPlayerObject().getPet()).getAttachment("AI");
if (petActor!=null){
petActor.addDefender(attacker);
DevLog.debugout("Charon", "Pet AI", "applyDamage addDefender");