From ab498b9f607e5245c401b9026f6ec3f998a36043 Mon Sep 17 00:00:00 2001 From: Olof Larsson Date: Wed, 10 Apr 2013 08:40:41 +0200 Subject: [PATCH] Use .get() method always. --- src/com/massivecraft/factions/FPlayerColl.java | 6 ++---- src/com/massivecraft/factions/FactionColl.java | 4 +--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/com/massivecraft/factions/FPlayerColl.java b/src/com/massivecraft/factions/FPlayerColl.java index 40133ddf..febd0811 100644 --- a/src/com/massivecraft/factions/FPlayerColl.java +++ b/src/com/massivecraft/factions/FPlayerColl.java @@ -11,9 +11,7 @@ import com.massivecraft.factions.zcore.persist.PlayerEntityCollection; public class FPlayerColl extends PlayerEntityCollection { - public static FPlayerColl i = new FPlayerColl(); - - Factions p = Factions.get(); + public static FPlayerColl i = new FPlayerColl(); private FPlayerColl() { @@ -41,7 +39,7 @@ public class FPlayerColl extends PlayerEntityCollection { 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); } } diff --git a/src/com/massivecraft/factions/FactionColl.java b/src/com/massivecraft/factions/FactionColl.java index 3e32cd6d..af1872c8 100644 --- a/src/com/massivecraft/factions/FactionColl.java +++ b/src/com/massivecraft/factions/FactionColl.java @@ -20,8 +20,6 @@ public class FactionColl extends EntityCollection { public static FactionColl i = new FactionColl(); - Factions p = Factions.get(); - private FactionColl() { super @@ -183,7 +181,7 @@ public class FactionColl extends EntityCollection { 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(); FPlayerColl.i.clean(); }