From 123787d48107c4344bc5fc2d63b617126ae0a7d3 Mon Sep 17 00:00:00 2001
From: Obique PSWG <obique.pswg@gmail.com>
Date: Tue, 24 May 2016 09:41:00 -0500
Subject: [PATCH] Fixed tangible object flags

---
 .../objects/tangible/TangibleObject.java          | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/resources/objects/tangible/TangibleObject.java b/src/resources/objects/tangible/TangibleObject.java
index da0693c61..a663cd214 100644
--- a/src/resources/objects/tangible/TangibleObject.java
+++ b/src/resources/objects/tangible/TangibleObject.java
@@ -29,6 +29,7 @@ package resources.objects.tangible;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
+import java.util.Set;
 
 import intents.FactionIntent;
 import intents.FactionIntent.FactionIntentType;
@@ -74,8 +75,6 @@ public class TangibleObject extends SWGObject {
 	}
 	
 	private void readObject(ObjectInputStream ois) throws ClassNotFoundException, IOException {
-		pvpStatus = PvpStatus.COMBATANT;
-		pvpFaction = PvpFaction.NEUTRAL;
 		ois.defaultReadObject();
 		defenders.clear();
 		defenders.resetUpdateCount();
@@ -213,13 +212,15 @@ public class TangibleObject extends SWGObject {
 	}
 
 	public boolean hasOptionFlags(OptionFlag ... options) {
-		int passCount = 0;
 		for (OptionFlag option : options) {
-			if ((optionFlags & option.getFlag()) == option.getFlag())
-				passCount++;
+			if ((optionFlags & option.getFlag()) == 0)
+				return false;
 		}
-
-		return passCount == options.length;
+		return true;
+	}
+	
+	public Set<OptionFlag> getOptionFlags() {
+		return OptionFlag.toEnumSet(optionFlags);
 	}
 	
 	public void addDefender(CreatureObject creature) {