Rx3/Factions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor stuff

Browse Source
This commit is contained in:
Olof Larsson 2013-04-24 16:40:35 +02:00
parent 7e33bd0bf1
commit 0992c403b5
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/massivecraft/factions/entity/Faction.java
View File

@ -133,19 +133,24 @@ public class Faction extends Entity<Faction> implements EconomyParticipator
public String getTag() public String getTag()
{ {
String ret = this.tag; String ret = this.tag;
if (UConf.get(this).factionTagForceUpperCase)
UConf uconf = UConf.get(this);
if (uconf != null && UConf.get(this).factionTagForceUpperCase)
{ {
ret = ret.toUpperCase(); ret = ret.toUpperCase();
} }
return ret; return ret;
} }
public void setTag(String str) public void setTag(String str)
{ {
if (UConf.get(this).factionTagForceUpperCase) UConf uconf = UConf.get(this);
if (uconf != null && UConf.get(this).factionTagForceUpperCase)
{ {
str = str.toUpperCase(); str = str.toUpperCase();
} }
this.tag = str; this.tag = str;
this.changed(); this.changed();
} }
@ -264,7 +269,9 @@ public class Faction extends Entity<Faction> implements EconomyParticipator
public boolean isDefaultOpen() public boolean isDefaultOpen()
{ {
return UConf.get(this).defaultFactionOpen; UConf uconf = UConf.get(this);
if (uconf == null) return false;
return uconf.defaultFactionOpen;
} }
public boolean isOpen() public boolean isOpen()
@ -274,9 +281,8 @@ public class Faction extends Entity<Faction> implements EconomyParticipator
return ret; return ret;
} }
public void setOpen(Boolean open) public void setOpen(boolean open)
{ {
if (open == null || MUtil.equals(open, this.isDefaultOpen())) open = null;
this.open = open; this.open = open;
this.changed(); this.changed();
} }

12
src/com/massivecraft/factions/entity/FactionColl.java
View File

@ -127,7 +127,7 @@ public class FactionColl extends Coll<Faction>
Faction faction = this.get(id); Faction faction = this.get(id);
if (faction != null) return faction; if (faction != null) return faction;
faction = this.createNewInstance(); faction = this.create(id);
faction.setTag(ChatColor.DARK_GREEN+"Wilderness"); faction.setTag(ChatColor.DARK_GREEN+"Wilderness");
faction.setDescription(null); faction.setDescription(null);
@ -150,8 +150,6 @@ public class FactionColl extends Coll<Faction>
faction.setPermittedRelations(FPerm.BUTTON, Rel.LEADER, Rel.OFFICER, Rel.MEMBER, Rel.RECRUIT, Rel.ALLY, Rel.TRUCE, Rel.NEUTRAL, Rel.ENEMY); faction.setPermittedRelations(FPerm.BUTTON, Rel.LEADER, Rel.OFFICER, Rel.MEMBER, Rel.RECRUIT, Rel.ALLY, Rel.TRUCE, Rel.NEUTRAL, Rel.ENEMY);
faction.setPermittedRelations(FPerm.LEVER, Rel.LEADER, Rel.OFFICER, Rel.MEMBER, Rel.RECRUIT, Rel.ALLY, Rel.TRUCE, Rel.NEUTRAL, Rel.ENEMY); faction.setPermittedRelations(FPerm.LEVER, Rel.LEADER, Rel.OFFICER, Rel.MEMBER, Rel.RECRUIT, Rel.ALLY, Rel.TRUCE, Rel.NEUTRAL, Rel.ENEMY);
this.attach(faction, id);
return faction; return faction;
} }
@ -161,7 +159,7 @@ public class FactionColl extends Coll<Faction>
Faction faction = this.get(id); Faction faction = this.get(id);
if (faction != null) return faction; if (faction != null) return faction;
faction = this.createNewInstance(); faction = this.create(id);
faction.setTag("SafeZone"); faction.setTag("SafeZone");
faction.setDescription("Free from PVP and monsters"); faction.setDescription("Free from PVP and monsters");
@ -184,8 +182,6 @@ public class FactionColl extends Coll<Faction>
faction.setPermittedRelations(FPerm.LEVER, Rel.LEADER, Rel.OFFICER, Rel.MEMBER, Rel.RECRUIT, Rel.ALLY, Rel.TRUCE, Rel.NEUTRAL, Rel.ENEMY); faction.setPermittedRelations(FPerm.LEVER, Rel.LEADER, Rel.OFFICER, Rel.MEMBER, Rel.RECRUIT, Rel.ALLY, Rel.TRUCE, Rel.NEUTRAL, Rel.ENEMY);
faction.setPermittedRelations(FPerm.TERRITORY, Rel.LEADER, Rel.OFFICER, Rel.MEMBER); faction.setPermittedRelations(FPerm.TERRITORY, Rel.LEADER, Rel.OFFICER, Rel.MEMBER);
this.attach(faction, id);
return faction; return faction;
} }
@ -195,7 +191,7 @@ public class FactionColl extends Coll<Faction>
Faction faction = this.get(id); Faction faction = this.get(id);
if (faction != null) return faction; if (faction != null) return faction;
faction = this.createNewInstance(); faction = this.create(id);
faction.setTag("WarZone"); faction.setTag("WarZone");
faction.setDescription("Not the safest place to be"); faction.setDescription("Not the safest place to be");
@ -218,8 +214,6 @@ public class FactionColl extends Coll<Faction>
faction.setPermittedRelations(FPerm.LEVER, Rel.LEADER, Rel.OFFICER, Rel.MEMBER, Rel.RECRUIT, Rel.ALLY, Rel.TRUCE, Rel.NEUTRAL, Rel.ENEMY); faction.setPermittedRelations(FPerm.LEVER, Rel.LEADER, Rel.OFFICER, Rel.MEMBER, Rel.RECRUIT, Rel.ALLY, Rel.TRUCE, Rel.NEUTRAL, Rel.ENEMY);
faction.setPermittedRelations(FPerm.TERRITORY, Rel.LEADER, Rel.OFFICER, Rel.MEMBER); faction.setPermittedRelations(FPerm.TERRITORY, Rel.LEADER, Rel.OFFICER, Rel.MEMBER);
this.attach(faction, id);
return faction; return faction;
} }