projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-10-08 23:13:25 -04:00
Code Issues Projects Releases Wiki Activity

Fixed tangible object flags

Browse Source
This commit is contained in:
Obique PSWG
2016-05-24 09:41:00 -05:00
parent d1fdcbf84f
commit 123787d481
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/tangible/TangibleObject.java
+8 -7
View File
@@ -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) {