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

More work on AI and spawns

Browse Source
This commit is contained in:
Light2
2013-12-04 19:05:02 +01:00
parent f8362d338b
commit b22b1d818d
25 changed files with 722 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/tangible/TangibleObject.java
+15 -4
View File
@@ -29,6 +29,7 @@ import java.util.Vector;
import protocol.swg.ObjControllerMessage;
import protocol.swg.PlayClientEffectObjectMessage;
import protocol.swg.StopClientEffectObjectByLabel;
import protocol.swg.UpdatePVPStatusMessage;
import protocol.swg.objectControllerObjects.ShowFlyText;
import resources.common.RGB;
@@ -57,7 +58,7 @@ public class TangibleObject extends SWGObject {
protected byte[] customization;
private List<Integer> componentCustomizations = new ArrayList<Integer>();
protected int optionsBitmask = 0;
private int maxDamage = 0;
private int maxDamage = 1000;
private boolean staticObject = false;
protected String faction = "";
@NotPersistent
@@ -92,12 +93,17 @@ public class TangibleObject extends SWGObject {
this.incapTimer = incapTimer;
}
public int getConditionDamage() {
public synchronized int getConditionDamage() {
return conditionDamage;
}
public void setConditionDamage(int conditionDamage) {
public synchronized void setConditionDamage(int conditionDamage) {
if(conditionDamage < 0)
conditionDamage = 0;
else if(conditionDamage > getMaxDamage())
conditionDamage = getMaxDamage();
this.conditionDamage = conditionDamage;
notifyObservers(messageBuilder.buildConditionDamageDelta(conditionDamage), false);
}
public byte[] getCustomization() {
@@ -142,7 +148,7 @@ public class TangibleObject extends SWGObject {
public int getPvPBitmask() {
synchronized(objectMutex) {
return optionsBitmask;
return pvpBitmask;
}
}
@@ -291,6 +297,11 @@ public class TangibleObject extends SWGObject {
destination.getSession().write(messageBuilder.buildBaseline8());
destination.getSession().write(messageBuilder.buildBaseline9());
UpdatePVPStatusMessage upvpm = new UpdatePVPStatusMessage(getObjectID());
upvpm.setFaction(UpdatePVPStatusMessage.factionCRC.Neutral);
upvpm.setStatus(1);
destination.getSession().write(upvpm.serialize());
}