From 8fdd07b08f07aff279de454e2901c460fcc87b84 Mon Sep 17 00:00:00 2001
From: Brettflan <dsr@fenrisoft.com>
Date: Sat, 26 Jan 2013 19:59:00 -0600
Subject: [PATCH] minor cleanup; made econLandReward default to 0, disabled

---
 src/com/massivecraft/factions/Conf.java     | 3 +--
 src/com/massivecraft/factions/Factions.java | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/com/massivecraft/factions/Conf.java b/src/com/massivecraft/factions/Conf.java
index f4df9796..e1e9c4ac 100644
--- a/src/com/massivecraft/factions/Conf.java
+++ b/src/com/massivecraft/factions/Conf.java
@@ -238,8 +238,7 @@ public class Conf
 	public static double econCostEnemy = 0.0;
 
 	public static int    econLandRewardTaskRunsEveryXMinutes = 20;
-	public static double econLandReward = 0.03;
-	public static double econLandRevertEnemyReward = 25.0;
+	public static double econLandReward = 0.00;
 	
 	//Faction banks, to pay for land claiming and other costs instead of individuals paying for them
 	public static boolean bankEnabled = true;
diff --git a/src/com/massivecraft/factions/Factions.java b/src/com/massivecraft/factions/Factions.java
index 736ed66c..4851c288 100644
--- a/src/com/massivecraft/factions/Factions.java
+++ b/src/com/massivecraft/factions/Factions.java
@@ -263,6 +263,8 @@ public class Factions extends EntityCollection<Faction>
 
 	public void econLandRewardRoutine()
 	{
+		if ( ! Econ.shouldBeUsed()) return;
+
 		P.p.log("Running econLandRewardRoutine...");
 		for (Faction faction : this.get())
 		{