From 03c058483c4bb97fcd8ac886f69c5acacd635e36 Mon Sep 17 00:00:00 2001
From: Olof Larsson <olof@sylt.nu>
Date: Tue, 16 Apr 2013 09:28:07 +0200
Subject: [PATCH] MCore Change

---
 src/com/massivecraft/factions/BoardColl.java         | 2 +-
 src/com/massivecraft/factions/FPlayerColl.java       | 2 +-
 src/com/massivecraft/factions/FactionColl.java       | 2 +-
 src/com/massivecraft/factions/cmd/arg/ARFaction.java | 1 -
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/com/massivecraft/factions/BoardColl.java b/src/com/massivecraft/factions/BoardColl.java
index 4212f0cf..ec71ab39 100644
--- a/src/com/massivecraft/factions/BoardColl.java
+++ b/src/com/massivecraft/factions/BoardColl.java
@@ -25,7 +25,7 @@ public class BoardColl extends Coll<Board> implements BoardInterface
 	public static BoardColl get() { return i; }
 	private BoardColl()
 	{
-		super(MStore.getDb(ConfServer.dburi), Factions.get(), "uuid", Const.COLLECTION_BASENAME_BOARD, Board.class, true);
+		super(Const.COLLECTION_BASENAME_BOARD, Board.class, MStore.getDb(ConfServer.dburi), Factions.get(), true, true);
 	}
 	
 	// -------------------------------------------- //
diff --git a/src/com/massivecraft/factions/FPlayerColl.java b/src/com/massivecraft/factions/FPlayerColl.java
index 9fdd14e4..91db7bf0 100644
--- a/src/com/massivecraft/factions/FPlayerColl.java
+++ b/src/com/massivecraft/factions/FPlayerColl.java
@@ -20,7 +20,7 @@ public class FPlayerColl extends SenderColl<FPlayer>
 	public static FPlayerColl get() { return i; }
 	private FPlayerColl()
 	{
-		super(MStore.getDb(ConfServer.dburi), Factions.get(), Const.COLLECTION_BASENAME_PLAYER, FPlayer.class, true, true);
+		super(Const.COLLECTION_BASENAME_PLAYER, FPlayer.class, MStore.getDb(ConfServer.dburi), Factions.get());
 	}
 	
 	// -------------------------------------------- //
diff --git a/src/com/massivecraft/factions/FactionColl.java b/src/com/massivecraft/factions/FactionColl.java
index e28033e5..54712fb2 100644
--- a/src/com/massivecraft/factions/FactionColl.java
+++ b/src/com/massivecraft/factions/FactionColl.java
@@ -26,7 +26,7 @@ public class FactionColl extends Coll<Faction>
 	public static FactionColl get() { return i; }
 	private FactionColl()
 	{
-		super(MStore.getDb(ConfServer.dburi), Factions.get(), "uuid", Const.COLLECTION_BASENAME_FACTION, Faction.class, false);
+		super(Const.COLLECTION_BASENAME_FACTION, Faction.class, MStore.getDb(ConfServer.dburi), Factions.get());
 	}
 	
 	// -------------------------------------------- //
diff --git a/src/com/massivecraft/factions/cmd/arg/ARFaction.java b/src/com/massivecraft/factions/cmd/arg/ARFaction.java
index 3620ac66..8c104142 100644
--- a/src/com/massivecraft/factions/cmd/arg/ARFaction.java
+++ b/src/com/massivecraft/factions/cmd/arg/ARFaction.java
@@ -46,7 +46,6 @@ public class ARFaction extends ArgReaderAbstract<Faction>
 		
 		result.setErrors(Txt.parse("<b>No faction or player matching \"<p>%s<b>\".", str));
 		return result;
-		
 	}
 	
 }