From 0af04162355ff8525280fa41c807a134396bdb91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?SvenjaRei=C3=9Faus?= <alvaro.pena@finursa.com>
Date: Thu, 14 Mar 2019 08:56:09 -0500
Subject: [PATCH] Custom faction starting balance config in JSON

---
 src/main/java/com/massivecraft/factions/Conf.java               | 1 +
 src/main/java/com/massivecraft/factions/cmd/CmdCreate.java      | 2 +-
 .../massivecraft/factions/listeners/FactionsPlayerListener.java | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/massivecraft/factions/Conf.java b/src/main/java/com/massivecraft/factions/Conf.java
index e52ae0d6..9329f4d0 100644
--- a/src/main/java/com/massivecraft/factions/Conf.java
+++ b/src/main/java/com/massivecraft/factions/Conf.java
@@ -240,6 +240,7 @@ public class Conf {
 	public static double econCostMap = 0.0;
 	public static double econCostPower = 0.0;
 	public static double econCostShow = 0.0;
+	public static double econFactionStartingBalance = 0.0;
 
 
 	// -------------------------------------------- //
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdCreate.java b/src/main/java/com/massivecraft/factions/cmd/CmdCreate.java
index 5893e46c..5169c1f7 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdCreate.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdCreate.java
@@ -99,7 +99,7 @@ public class CmdCreate extends FCommand {
 		msg(TL.COMMAND_CREATE_YOUSHOULD, p.cmdBase.cmdDescription.getUseageTemplate());
 
 		if (Conf.econEnabled) {
-			Econ.setBalance(faction.getAccountId(), 0);
+			Econ.setBalance(faction.getAccountId(), Conf.econFactionStartingBalance);
 		}
 
 		if (Conf.logFactionCreate) {
diff --git a/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java
index 937b4a81..ffe3aa4a 100644
--- a/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java
+++ b/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java
@@ -657,7 +657,7 @@ public class FactionsPlayerListener implements Listener {
 		FPlayer fplayer = FPlayers.getInstance().getByPlayer(player);
 		User user = SavageFactions.plugin.ess.getUser(event.getPlayer());
 		List<String> homes = user.getHomes();
-		if (fac.isWilderness() || FPlayers.getInstance().getByPlayer(event.getPlayer()).getFactionId().equals(fac.getId())) {
+		if (fac.isWilderness() || fplayer.getFactionId().equals(fac.getId())) {
 			return;
 		}
 		//Warzone and SafeZone Home Initializers