Moved factionStatus from CREO to TANO

src/resources/objects/tangible/TangibleObject.java

@@ -53,7 +53,7 @@ import engine.resources.scene.Planet;
 import engine.resources.scene.Point3D;
 import engine.resources.scene.Quaternion;
 
-@Persistent(version=5)
+@Persistent(version=6)
 public class TangibleObject extends SWGObject {
 	
 	// TODO: Thread safety
@@ -68,6 +68,7 @@ public class TangibleObject extends SWGObject {
 	private int maxDamage = 1000;
 	private boolean staticObject = true;
 	protected String faction = ""; // Says you're "Imperial Special Forces" if it's 0 for some reason
+	protected int factionStatus = 0;
 	@NotPersistent
 	private Vector<TangibleObject> defendersList = new Vector<TangibleObject>();	// unused in packets but useful for the server
 	@NotPersistent
@@ -309,7 +310,19 @@ public class TangibleObject extends SWGObject {
 		
 		updatePvpStatus();
 	}
-
+	
+	public int getFactionStatus() {
+		synchronized(objectMutex) {
+			return factionStatus;
+		}
+	}
+	
+	public void setFactionStatus(int factionStatus) {
+		synchronized(objectMutex) {
+			this.factionStatus = factionStatus;
+		}
+	}
+	
 	public Vector<TangibleObject> getDefendersList() {
 	    synchronized(objectMutex) {
     			return defendersList;