projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-01-15 23:05:45 -05:00
Code Issues Projects Releases Wiki Activity

Adjusted CLs of all Restuss NPCs

Browse Source 
Recruiter conversation is now much cleaner and less bulky than before
Rori patrol updated
New characters now get neutral faction assigned
This commit is contained in:
Undercova
2021-03-03 07:44:19 +01:00
parent 0c50184a59
commit 13008dec0f
58 changed files with 234 additions and 1176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/projectswg/holocore/resources/support/objects/swg/tangible/TangibleObject.java
View File

@@ -61,8 +61,8 @@ public class TangibleObject extends SWGObject {
private boolean inCombat = false;
private int condition = 0;
private Set<PvpFlag> pvpFlags = EnumSet.noneOf(PvpFlag.class);
private PvpStatus pvpStatus = PvpStatus.COMBATANT;
private Faction faction = null;
private PvpStatus pvpStatus = PvpStatus.COMBATANT;
private Faction faction = ServerData.INSTANCE.getFactions().getFaction(PvpFaction.NEUTRAL.name().toLowerCase(Locale.US));
private boolean visibleGmOnly = true;
private byte [] objectEffects = new byte[0];
private int optionFlags = 0;