Use .get() method always.

This commit is contained in:
Olof Larsson 2013-04-10 08:40:41 +02:00
parent 00774087d3
commit ab498b9f60
2 changed files with 3 additions and 7 deletions

View File

@ -11,9 +11,7 @@ import com.massivecraft.factions.zcore.persist.PlayerEntityCollection;
public class FPlayerColl extends PlayerEntityCollection<FPlayer> public class FPlayerColl extends PlayerEntityCollection<FPlayer>
{ {
public static FPlayerColl i = new FPlayerColl(); public static FPlayerColl i = new FPlayerColl();
Factions p = Factions.get();
private FPlayerColl() private FPlayerColl()
{ {
@ -41,7 +39,7 @@ public class FPlayerColl extends PlayerEntityCollection<FPlayer>
{ {
if ( ! FactionColl.i.exists(fplayer.getFactionId())) if ( ! FactionColl.i.exists(fplayer.getFactionId()))
{ {
p.log("Reset faction data (invalid faction) for player "+fplayer.getName()); Factions.get().log("Reset faction data (invalid faction) for player "+fplayer.getName());
fplayer.resetFactionData(false); fplayer.resetFactionData(false);
} }
} }

View File

@ -20,8 +20,6 @@ public class FactionColl extends EntityCollection<Faction>
{ {
public static FactionColl i = new FactionColl(); public static FactionColl i = new FactionColl();
Factions p = Factions.get();
private FactionColl() private FactionColl()
{ {
super super
@ -183,7 +181,7 @@ public class FactionColl extends EntityCollection<Faction>
{ {
if ( ! this.exists(id)) if ( ! this.exists(id))
{ {
p.log(Level.WARNING, "Non existing factionId "+id+" requested! Issuing cleaning!"); Factions.get().log(Level.WARNING, "Non existing factionId "+id+" requested! Issuing cleaning!");
Board.clean(); Board.clean();
FPlayerColl.i.clean(); FPlayerColl.i.clean();
} }