projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-09-12 22:45:31 -04:00
Code Issues Projects Releases Wiki Activity

Refactored TANO

Browse Source
This commit is contained in:
Treeku
2014-05-14 14:57:49 +01:00
parent f9c542063a
commit c564a016e4
12 changed files with 410 additions and 663 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/creature/CreatureObject.java
+4 -55
View File
@@ -187,7 +187,7 @@ public class CreatureObject extends TangibleObject implements Serializable {
private transient SWGObject useTarget;
public CreatureObject(long objectID, Planet planet, Point3D position, Quaternion orientation, String Template) {
super(objectID, planet, Template, position, orientation);
super(objectID, planet, position, orientation, Template);
messageBuilder = new CreatureMessageBuilder(this);
loadTemplateData();
skills = new ArrayList<String>();
@@ -234,12 +234,6 @@ public class CreatureObject extends TangibleObject implements Serializable {
}
public void setCustomName2(String customName) {
setCustomName(customName);
notifyObservers(messageBuilder.buildCustomNameDelta(customName), true);
}
public int getBankCredits() {
synchronized(objectMutex) {
return bankCredits;
@@ -351,25 +345,6 @@ public class CreatureObject extends TangibleObject implements Serializable {
}
@Override
public int getOptionsBitmask() {
synchronized(objectMutex) {
return optionsBitmask;
}
}
@Override
public void setOptionsBitmask(int optionBitmask) {
synchronized(objectMutex) {
this.optionsBitmask = optionBitmask;
}
IoBuffer optionDelta = messageBuilder.buildOptionMaskDelta(optionBitmask);
notifyObservers(optionDelta, true);
}
public void setOptions(int options, boolean add) {
synchronized(objectMutex) {
if (options != 0) {
@@ -485,15 +460,9 @@ public class CreatureObject extends TangibleObject implements Serializable {
this.inspirationTick = inspirationTick;
}
}
@Override
public void setFaction(String faction) {
synchronized(objectMutex) {
this.faction = faction;
}
notifyObservers(messageBuilder.buildFactionDelta(faction), true);
super.setFaction(faction);
CreatureObject companion = NGECore.getInstance().mountService.getCompanion(this);
@@ -502,13 +471,8 @@ public class CreatureObject extends TangibleObject implements Serializable {
}
}
@Override
public void setFactionStatus(int factionStatus) {
synchronized(objectMutex) {
this.factionStatus = factionStatus;
}
notifyObservers(messageBuilder.buildFactionStatusDelta(factionStatus), true);
super.setFactionStatus(factionStatus);
CreatureObject companion = NGECore.getInstance().mountService.getCompanion(this);
@@ -812,21 +776,6 @@ public class CreatureObject extends TangibleObject implements Serializable {
return missionCriticalObjects;
}
public byte getCombatFlag() {
synchronized(objectMutex) {
return combatFlag;
}
}
public void setCombatFlag(byte combatFlag) {
synchronized(objectMutex) {
this.combatFlag = combatFlag;
}
IoBuffer combatDelta = messageBuilder.buildCombatFlagDelta(combatFlag);
notifyObservers(combatDelta, true);
}
public short getLevel() {
synchronized(objectMutex) {
return level;