Merge branch 'master' of github.com:MassiveCraft/Factions

This commit is contained in:
Olof Larsson 2012-01-28 19:49:16 +01:00
commit d3645d3c95

View File

@ -23,7 +23,7 @@ public class Faction extends Entity implements EconomyParticipator
// FIELD: fplayers
// speedy lookup of players in faction
private Set<FPlayer> fplayers = new HashSet<FPlayer>();
private transient Set<FPlayer> fplayers = new HashSet<FPlayer>();
// FIELD: invites
// Where string is a lowercase player name
@ -351,13 +351,13 @@ public class Faction extends Entity implements EconomyParticipator
}
}
}
public boolean addFPlayer(FPlayer fplayer)
protected boolean addFPlayer(FPlayer fplayer)
{
if (this.isNone()) return false;
return fplayers.add(fplayer);
}
public boolean removeFPlayer(FPlayer fplayer)
protected boolean removeFPlayer(FPlayer fplayer)
{
if (this.isNone()) return false;