From 0642b0ede4401084941b40b381352c7cc9d1712b Mon Sep 17 00:00:00 2001
From: Olof Larsson <olof@sylt.nu>
Date: Mon, 3 Aug 2015 16:17:38 +0200
Subject: [PATCH] New getAll methods.

---
 src/com/massivecraft/factions/cmd/CmdFactionsList.java | 2 +-
 src/com/massivecraft/factions/entity/MFlag.java        | 3 ++-
 src/com/massivecraft/factions/entity/MFlagColl.java    | 3 +--
 src/com/massivecraft/factions/entity/MPerm.java        | 3 ++-
 src/com/massivecraft/factions/entity/MPermColl.java    | 3 +--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsList.java b/src/com/massivecraft/factions/cmd/CmdFactionsList.java
index adb04a25..6255fdcd 100644
--- a/src/com/massivecraft/factions/cmd/CmdFactionsList.java
+++ b/src/com/massivecraft/factions/cmd/CmdFactionsList.java
@@ -55,7 +55,7 @@ public class CmdFactionsList extends FactionsCommand
 			public void run()
 			{
 				// Create Pager
-				final List<Faction> factions = FactionColl.get().getAll(null, FactionListComparator.get());
+				final List<Faction> factions = FactionColl.get().getAll(FactionListComparator.get());
 				final PagerSimple<Faction> pager = new PagerSimple<Faction>(factions, sender);
 				
 				// Use Pager
diff --git a/src/com/massivecraft/factions/entity/MFlag.java b/src/com/massivecraft/factions/entity/MFlag.java
index 9763ce00..569ff7d3 100644
--- a/src/com/massivecraft/factions/entity/MFlag.java
+++ b/src/com/massivecraft/factions/entity/MFlag.java
@@ -5,6 +5,7 @@ import java.util.List;
 import com.massivecraft.factions.event.EventFactionsCreateFlags;
 import com.massivecraft.massivecore.PredictateIsRegistered;
 import com.massivecraft.massivecore.Prioritized;
+import com.massivecraft.massivecore.PriorityComparator;
 import com.massivecraft.massivecore.Registerable;
 import com.massivecraft.massivecore.collections.MassiveList;
 import com.massivecraft.massivecore.store.Entity;
@@ -60,7 +61,7 @@ public class MFlag extends Entity<MFlag> implements Prioritized, Registerable
 	{
 		setupStandardFlags();
 		new EventFactionsCreateFlags(isAsync).run();
-		return MFlagColl.get().getAll(PredictateIsRegistered.get());
+		return MFlagColl.get().getAll(PredictateIsRegistered.get(), PriorityComparator.get());
 	}
 	
 	public static void setupStandardFlags()
diff --git a/src/com/massivecraft/factions/entity/MFlagColl.java b/src/com/massivecraft/factions/entity/MFlagColl.java
index 6118e555..a4248ab4 100644
--- a/src/com/massivecraft/factions/entity/MFlagColl.java
+++ b/src/com/massivecraft/factions/entity/MFlagColl.java
@@ -5,7 +5,6 @@ import java.util.List;
 
 import com.massivecraft.factions.Const;
 import com.massivecraft.factions.Factions;
-import com.massivecraft.massivecore.PriorityComparator;
 import com.massivecraft.massivecore.store.Coll;
 import com.massivecraft.massivecore.store.MStore;
 
@@ -19,7 +18,7 @@ public class MFlagColl extends Coll<MFlag>
 	public static MFlagColl get() { return i; }
 	private MFlagColl()
 	{
-		super(Const.COLLECTION_MFLAG, MFlag.class, MStore.getDb(), Factions.get(), false, true, null, PriorityComparator.get());
+		super(Const.COLLECTION_MFLAG, MFlag.class, MStore.getDb(), Factions.get(), false, true);
 	}
 
 	// -------------------------------------------- //
diff --git a/src/com/massivecraft/factions/entity/MPerm.java b/src/com/massivecraft/factions/entity/MPerm.java
index eca1179f..ec6e3681 100644
--- a/src/com/massivecraft/factions/entity/MPerm.java
+++ b/src/com/massivecraft/factions/entity/MPerm.java
@@ -14,6 +14,7 @@ import com.massivecraft.factions.TerritoryAccess;
 import com.massivecraft.factions.event.EventFactionsCreatePerms;
 import com.massivecraft.massivecore.PredictateIsRegistered;
 import com.massivecraft.massivecore.Prioritized;
+import com.massivecraft.massivecore.PriorityComparator;
 import com.massivecraft.massivecore.Registerable;
 import com.massivecraft.massivecore.ps.PS;
 import com.massivecraft.massivecore.store.Entity;
@@ -97,7 +98,7 @@ public class MPerm extends Entity<MPerm> implements Prioritized, Registerable
 		setupStandardPerms();
 		new EventFactionsCreatePerms().run();
 		
-		return MPermColl.get().getAll(PredictateIsRegistered.get());
+		return MPermColl.get().getAll(PredictateIsRegistered.get(), PriorityComparator.get());
 	}
 	
 	public static void setupStandardPerms()
diff --git a/src/com/massivecraft/factions/entity/MPermColl.java b/src/com/massivecraft/factions/entity/MPermColl.java
index c0bf9228..7711373f 100644
--- a/src/com/massivecraft/factions/entity/MPermColl.java
+++ b/src/com/massivecraft/factions/entity/MPermColl.java
@@ -5,7 +5,6 @@ import java.util.List;
 
 import com.massivecraft.factions.Const;
 import com.massivecraft.factions.Factions;
-import com.massivecraft.massivecore.PriorityComparator;
 import com.massivecraft.massivecore.store.Coll;
 import com.massivecraft.massivecore.store.MStore;
 
@@ -19,7 +18,7 @@ public class MPermColl extends Coll<MPerm>
 	public static MPermColl get() { return i; }
 	private MPermColl()
 	{
-		super(Const.COLLECTION_MPERM, MPerm.class, MStore.getDb(), Factions.get(), false, true, null, PriorityComparator.get());
+		super(Const.COLLECTION_MPERM, MPerm.class, MStore.getDb(), Factions.get(), false, true);
 	}
 
 	// -------------------------------------------- //