mirror of
https://github.com/MassiveCraft/Factions.git
synced 2024-11-06 18:49:34 +01:00
Merge branch 'master' of github.com:MassiveCraft/Factions
This commit is contained in:
commit
d3645d3c95
@ -23,7 +23,7 @@ public class Faction extends Entity implements EconomyParticipator
|
|||||||
|
|
||||||
// FIELD: fplayers
|
// FIELD: fplayers
|
||||||
// speedy lookup of players in faction
|
// speedy lookup of players in faction
|
||||||
private Set<FPlayer> fplayers = new HashSet<FPlayer>();
|
private transient Set<FPlayer> fplayers = new HashSet<FPlayer>();
|
||||||
|
|
||||||
// FIELD: invites
|
// FIELD: invites
|
||||||
// Where string is a lowercase player name
|
// 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;
|
if (this.isNone()) return false;
|
||||||
|
|
||||||
return fplayers.add(fplayer);
|
return fplayers.add(fplayer);
|
||||||
}
|
}
|
||||||
public boolean removeFPlayer(FPlayer fplayer)
|
protected boolean removeFPlayer(FPlayer fplayer)
|
||||||
{
|
{
|
||||||
if (this.isNone()) return false;
|
if (this.isNone()) return false;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user