From 4f27928e8588f05d50fa6d4c1d331037564885f3 Mon Sep 17 00:00:00 2001
From: Magnus Ulf <magnus@muj.dk>
Date: Tue, 22 Jan 2019 16:11:09 +0100
Subject: [PATCH] Make econ work with Factions again

---
 .../massivecraft/massivecore/money/Money.java |  1 -
 .../massivecore/money/MoneyMixinVault.java    | 54 ++++++++++++++-----
 2 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/src/com/massivecraft/massivecore/money/Money.java b/src/com/massivecraft/massivecore/money/Money.java
index 84d53d8f..c1707c9c 100644
--- a/src/com/massivecraft/massivecore/money/Money.java
+++ b/src/com/massivecraft/massivecore/money/Money.java
@@ -25,7 +25,6 @@ public class Money
 		if (account == null) return null;
 		
 		// ... but if something is supplied we must manage to extract an id.
-		// NOTE: This ID is the name for now, later all money plugins will probably support UUIDs.
 		String ret = MUtil.extract(String.class, "accountId", account);
 		if (ret == null) throw new IllegalArgumentException("extraction of accountId from object failed: " + account.toString());
 		return ret;
diff --git a/src/com/massivecraft/massivecore/money/MoneyMixinVault.java b/src/com/massivecraft/massivecore/money/MoneyMixinVault.java
index 19ee392e..c29ae5e2 100644
--- a/src/com/massivecraft/massivecore/money/MoneyMixinVault.java
+++ b/src/com/massivecraft/massivecore/money/MoneyMixinVault.java
@@ -115,7 +115,13 @@ public class MoneyMixinVault extends MoneyMixinAbstract
 	@Override
 	public boolean exists(String accountId)
 	{
-		return this.getEconomy().hasAccount(getOfflinePlayer(accountId));
+		Object econObject = getEconomyObject(accountId);
+		OfflinePlayer op = econObject instanceof OfflinePlayer ? (OfflinePlayer) econObject : null;
+		String name = econObject instanceof String ? (String) econObject : null;
+
+		if (op != null) return this.getEconomy().hasAccount(op);
+		if (name != null) return this.getEconomy().hasAccount(name);
+		throw new RuntimeException();
 	}
 	
 	@Override
@@ -132,14 +138,28 @@ public class MoneyMixinVault extends MoneyMixinAbstract
 	public double get(String accountId)
 	{
 		this.ensureExists(accountId);
-		return this.getEconomy().getBalance(getOfflinePlayer(accountId));
+
+		Object econObject = getEconomyObject(accountId);
+		OfflinePlayer op = econObject instanceof OfflinePlayer ? (OfflinePlayer) econObject : null;
+		String name = econObject instanceof String ? (String) econObject : null;
+
+		if (op != null) return this.getEconomy().getBalance(op);
+		if (name != null) return this.getEconomy().getBalance(name);
+		throw new RuntimeException();
 	}
 	
 	@Override
 	public boolean has(String accountId, double amount)
 	{
 		this.ensureExists(accountId);
-		return this.getEconomy().has(getOfflinePlayer(accountId), amount);
+
+		Object econObject = getEconomyObject(accountId);
+		OfflinePlayer op = econObject instanceof OfflinePlayer ? (OfflinePlayer) econObject : null;
+		String name = econObject instanceof String ? (String) econObject : null;
+
+		if (op != null) return this.getEconomy().has(op, amount);
+		if (name != null) return this.getEconomy().has(name, amount);
+		throw new RuntimeException();
 	}
 	
 	// -------------------------------------------- //
@@ -200,24 +220,34 @@ public class MoneyMixinVault extends MoneyMixinAbstract
 	public boolean ensureExists(String accountId)
 	{
 		Economy economy = this.getEconomy();
+
+		Object econObject = getEconomyObject(accountId);
+		OfflinePlayer op = econObject instanceof OfflinePlayer ? (OfflinePlayer) econObject : null;
+		String name = econObject instanceof String ? (String) econObject : null;
 		
-		if (economy.hasAccount(getOfflinePlayer(accountId))) return true;
+		if (op != null && economy.hasAccount(op)) return true;
+		if (name != null && economy.hasAccount(name)) return true;
 		
-		if (!economy.createPlayerAccount(getOfflinePlayer(accountId))) return false;
+		if (op != null && !economy.createPlayerAccount(op)) return false;
+		if (name != null && !economy.createPlayerAccount(name)) return false;
 		
 		if (MUtil.isUuid(accountId)) return true;
+
+		// What is this for???
+		//double balance = economy.getBalance(getOfflinePlayer(accountId));
+		//economy.withdrawPlayer(getOfflinePlayer(accountId), balance);
 		
-		double balance = economy.getBalance(getOfflinePlayer(accountId));
-		economy.withdrawPlayer(getOfflinePlayer(accountId), balance);
-		
-		return true;
+		return false;
 	}
 
-	public static OfflinePlayer getOfflinePlayer(String accountId)
+	public static Object getEconomyObject(String accountId)
 	{
+		// Because of Factions we have this crazy-workaround.
+		// Where offlineplayers will be used when possible
+		// but otherwise names will.
 		OfflinePlayer ret = IdUtil.getOfflinePlayer(accountId);
-		if (ret == null) throw new RuntimeException("couldn't get offlineplayer for: " + accountId);
-		return ret;
+		if (ret != null) return ret;
+		else return accountId;
 	}
 
 }