From 8ac19453b68a16b025598790725a5037a81ef253 Mon Sep 17 00:00:00 2001
From: Olof Larsson <olof@sylt.nu>
Date: Wed, 24 Apr 2013 08:59:43 +0200
Subject: [PATCH] MCore change

---
 src/com/massivecraft/factions/entity/MConf.java             | 2 +-
 src/com/massivecraft/factions/integration/Econ.java         | 6 ------
 src/com/massivecraft/factions/task/TaskEconLandReward.java  | 2 +-
 .../massivecraft/factions/task/TaskPlayerDataRemove.java    | 2 +-
 .../massivecraft/factions/task/TaskPlayerPowerUpdate.java   | 2 +-
 5 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/com/massivecraft/factions/entity/MConf.java b/src/com/massivecraft/factions/entity/MConf.java
index 42cecd92..e0e5aeae 100644
--- a/src/com/massivecraft/factions/entity/MConf.java
+++ b/src/com/massivecraft/factions/entity/MConf.java
@@ -110,7 +110,7 @@ public class MConf extends Entity<MConf>
 	// DERPY OVERRIDES
 	// -------------------------------------------- //
 	// TODO: Should worldsNoPowerLoss rather be a bukkit permission node?
-	// TODO: These are derpy because they possibly use an invalid design approact.
+	// TODO: These are derpy because they possibly use an invalid design approach.
 	// After universe support is added. Would some of these be removed?
 	// Could it also be more customizeable using some sort of permission lookup map?
 	
diff --git a/src/com/massivecraft/factions/integration/Econ.java b/src/com/massivecraft/factions/integration/Econ.java
index 8b17d577..41f68b36 100644
--- a/src/com/massivecraft/factions/integration/Econ.java
+++ b/src/com/massivecraft/factions/integration/Econ.java
@@ -69,12 +69,6 @@ public class Econ
 
 	public static void sendBalanceInfo(UPlayer to, EconomyParticipator about)
 	{
-		if (!isEnabled(to))
-		{
-			Factions.get().log(Level.WARNING, "Vault does not appear to be hooked into an economy plugin.");
-			return;
-		}
-		
 		to.msg("<a>%s's<i> balance is <h>%s<i>.", about.describeTo(to, true), Money.format(about, Money.get(about)));
 	}
 
diff --git a/src/com/massivecraft/factions/task/TaskEconLandReward.java b/src/com/massivecraft/factions/task/TaskEconLandReward.java
index 0ad2c0c4..a08f6121 100644
--- a/src/com/massivecraft/factions/task/TaskEconLandReward.java
+++ b/src/com/massivecraft/factions/task/TaskEconLandReward.java
@@ -32,7 +32,7 @@ public class TaskEconLandReward extends ModuloRepeatTask
 	}
 	
 	@Override
-	public void invoke()
+	public void invoke(long now)
 	{
 		for (FactionColl coll : FactionColls.get().getColls())
 		{
diff --git a/src/com/massivecraft/factions/task/TaskPlayerDataRemove.java b/src/com/massivecraft/factions/task/TaskPlayerDataRemove.java
index aeb0982b..2eb00d2b 100644
--- a/src/com/massivecraft/factions/task/TaskPlayerDataRemove.java
+++ b/src/com/massivecraft/factions/task/TaskPlayerDataRemove.java
@@ -32,7 +32,7 @@ public class TaskPlayerDataRemove extends ModuloRepeatTask
 	}
 	
 	@Override
-	public void invoke()
+	public void invoke(long now)
 	{
 		for (UPlayerColl coll : UPlayerColls.get().getColls())
 		{
diff --git a/src/com/massivecraft/factions/task/TaskPlayerPowerUpdate.java b/src/com/massivecraft/factions/task/TaskPlayerPowerUpdate.java
index fde4a1e1..ab96d4e0 100644
--- a/src/com/massivecraft/factions/task/TaskPlayerPowerUpdate.java
+++ b/src/com/massivecraft/factions/task/TaskPlayerPowerUpdate.java
@@ -36,7 +36,7 @@ public class TaskPlayerPowerUpdate extends ModuloRepeatTask
 	}
 	
 	@Override
-	public void invoke()
+	public void invoke(long now)
 	{
 		long millis = this.getDelayMillis();