MassiveCore - MassivePlugin and Active

src/com/massivecraft/factions/entity/FactionColl.java

@@ -39,9 +39,11 @@ public class FactionColl extends Coll<Faction>
 	// -------------------------------------------- //
 	
 	@Override
-	public void init()
+	public void setActive(boolean active)
 	{
-		super.init();
+		super.setActive(active);
+		
+		if ( ! active) return;
 		
 		this.createSpecialFactions();
 	}

src/com/massivecraft/factions/entity/MConf.java

@@ -42,8 +42,8 @@ public class MConf extends Entity<MConf>
 		
 		if (!Factions.get().isDatabaseInitialized()) return this;
 		
-		EngineChat.get().deactivate();
-		EngineChat.get().activate();
+		EngineChat.get().setActive(false);
+		EngineChat.get().setActive(true);
 		
 		return this;
 	}

src/com/massivecraft/factions/entity/MConfColl.java

@@ -34,9 +34,10 @@ public class MConfColl extends Coll<MConf>
 	// -------------------------------------------- //
 	
 	@Override
-	public void init()
+	public void setActive(boolean active)
 	{
-		super.init();
+		super.setActive(active);
+		if ( ! active) return;
 		MConf.i = this.get(MassiveCore.INSTANCE, true);
 	}
 	

src/com/massivecraft/factions/entity/MFlagColl.java

@@ -37,9 +37,10 @@ public class MFlagColl extends Coll<MFlag>
 	// -------------------------------------------- //
 	
 	@Override
-	public void init()
+	public void setActive(boolean active)
 	{
-		super.init();
+		super.setActive(active);
+		if ( ! active) return;
 		MFlag.setupStandardFlags();
 	}
 	

src/com/massivecraft/factions/entity/MPerm.java

@@ -7,10 +7,10 @@ import java.util.Set;
 
 import org.bukkit.entity.Player;
 
-import com.massivecraft.factions.Factions;
 import com.massivecraft.factions.Perm;
 import com.massivecraft.factions.Rel;
 import com.massivecraft.factions.TerritoryAccess;
+import com.massivecraft.factions.cmd.CmdFactions;
 import com.massivecraft.factions.event.EventFactionsCreatePerms;
 import com.massivecraft.massivecore.Named;
 import com.massivecraft.massivecore.Prioritized;
@@ -298,7 +298,7 @@ public class MPerm extends Entity<MPerm> implements Prioritized, Registerable, N
 		Player player = mplayer.getPlayer();
 		if (player != null && Perm.OVERRIDE.has(player))
 		{
-			ret += Txt.parse("\n<i>You can bypass by using " + Factions.get().getOuterCmdFactions().cmdFactionsOverride.getTemplate(false).toPlain(true));
+			ret += Txt.parse("\n<i>You can bypass by using " + CmdFactions.get().cmdFactionsOverride.getTemplate(false).toPlain(true));
 		}
 		
 		return ret;

src/com/massivecraft/factions/entity/MPermColl.java

@@ -37,9 +37,10 @@ public class MPermColl extends Coll<MPerm>
 	// -------------------------------------------- //
 	
 	@Override
-	public void init()
+	public void setActive(boolean active)
 	{
-		super.init();
+		super.setActive(active);
+		if ( ! active) return;
 		MPerm.setupStandardPerms();
 	}