SpigotMC/Saber-Factions
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ensure that even if fields are missing from save file, that fields are instantiated.

Browse Source
This commit is contained in:
t00thpick1 2014-10-31 10:47:59 -04:00
parent 070afd9fe2
commit 3e15189c11
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/massivecraft/factions/zcore/persist/MemoryFaction.java
View File

@ -41,11 +41,11 @@ public abstract class MemoryFaction implements Faction, EconomyParticipator {
protected transient long lastPlayerLoggedOffTime; protected transient long lastPlayerLoggedOffTime;
protected double money; protected double money;
protected double powerBoost; protected double powerBoost;
protected Map<String, Relation> relationWish; protected Map<String, Relation> relationWish = new HashMap<String, Relation>();
protected Map<FLocation, Set<String>> claimOwnership = new ConcurrentHashMap<FLocation, Set<String>>(); protected Map<FLocation, Set<String>> claimOwnership = new ConcurrentHashMap<FLocation, Set<String>>();
protected transient Set<FPlayer> fplayers = new HashSet<FPlayer>(); protected transient Set<FPlayer> fplayers = new HashSet<FPlayer>();
protected Set<String> invites; protected Set<String> invites = new HashSet<String>();
protected HashMap<String, List<String>> announcements; protected HashMap<String, List<String>> announcements = new HashMap<String, List<String>>();
public HashMap<String, List<String>> getAnnouncements() { public HashMap<String, List<String>> getAnnouncements() {
return this.announcements; return this.announcements;
@ -236,8 +236,6 @@ public abstract class MemoryFaction implements Faction, EconomyParticipator {
public MemoryFaction(String id) { public MemoryFaction(String id) {
this.id = id; this.id = id;
this.relationWish = new HashMap<String, Relation>();
this.invites = new HashSet<String>();
this.open = Conf.newFactionsDefaultOpen; this.open = Conf.newFactionsDefaultOpen;
this.tag = "???"; this.tag = "???";
this.description = "Default faction description :("; this.description = "Default faction description :(";
@ -247,7 +245,6 @@ public abstract class MemoryFaction implements Faction, EconomyParticipator {
this.permanent = false; this.permanent = false;
this.money = 0.0; this.money = 0.0;
this.powerBoost = 0.0; this.powerBoost = 0.0;
this.announcements = new HashMap<String, List<String>>();
} }
public MemoryFaction(MemoryFaction old) { public MemoryFaction(MemoryFaction old) {