From a5179b514aa2c2b344c9f306606bc0513a823a43 Mon Sep 17 00:00:00 2001
From: Magnus Ulf <magnus@muj.dk>
Date: Fri, 4 Jan 2019 14:55:22 +0100
Subject: [PATCH] Fixes to Vault integration and improvements to IdUtil

---
 .../massivecore/money/MoneyMixinVault.java     |  6 +++---
 .../massivecraft/massivecore/util/IdUtil.java  | 18 ++++++++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/com/massivecraft/massivecore/money/MoneyMixinVault.java b/src/com/massivecraft/massivecore/money/MoneyMixinVault.java
index 2da60957..3b5066ea 100644
--- a/src/com/massivecraft/massivecore/money/MoneyMixinVault.java
+++ b/src/com/massivecraft/massivecore/money/MoneyMixinVault.java
@@ -151,9 +151,6 @@ public class MoneyMixinVault extends MoneyMixinAbstract
 	{
 		Economy economy = this.getEconomy();
 
-		OfflinePlayer offlinePlayerFrom = IdUtil.getOfflinePlayer(fromId);
-		OfflinePlayer offlinePlayerTo = IdUtil.getOfflinePlayer(toId);
-
 		// Ensure positive direction
 		if (amount < 0)
 		{
@@ -162,6 +159,9 @@ public class MoneyMixinVault extends MoneyMixinAbstract
 			fromId = toId;
 			toId = temp;
 		}
+
+		OfflinePlayer offlinePlayerFrom = IdUtil.getOfflinePlayer(fromId);
+		OfflinePlayer offlinePlayerTo = IdUtil.getOfflinePlayer(toId);
 		
 		// Ensure the accounts exist
 		if (fromId != null) this.ensureExists(fromId);
diff --git a/src/com/massivecraft/massivecore/util/IdUtil.java b/src/com/massivecraft/massivecore/util/IdUtil.java
index c68063b2..69965c92 100644
--- a/src/com/massivecraft/massivecore/util/IdUtil.java
+++ b/src/com/massivecraft/massivecore/util/IdUtil.java
@@ -481,6 +481,12 @@ public class IdUtil implements Listener, Runnable
 			String id = getIdFromSender((CommandSender) senderObject);
 			return getIdToData().get(id);
 		}
+
+		// OfflinePlayer (UUID recurse)
+		if (senderObject instanceof OfflinePlayer)
+		{
+			return getData(((OfflinePlayer) senderObject).getUniqueId());
+		}
 		
 		// UUID
 		if (senderObject instanceof UUID)
@@ -537,6 +543,12 @@ public class IdUtil implements Listener, Runnable
 		
 		// CommandSender
 		// Handled at "Already Done"
+
+		// OfflinePlayer
+		if (senderObject instanceof OfflinePlayer)
+		{
+			return getSender(((OfflinePlayer) senderObject).getUniqueId());
+		}
 		
 		// UUID
 		if (senderObject instanceof UUID)
@@ -601,6 +613,9 @@ public class IdUtil implements Listener, Runnable
 			String id = sender.getName();
 			return MUtil.asUuid(id);
 		}
+
+		// OfflinePlayer
+		if (senderObject instanceof OfflinePlayer) return ((OfflinePlayer) senderObject).getUniqueId();
 		
 		// UUID
 		// Handled at "Already Done"
@@ -658,6 +673,9 @@ public class IdUtil implements Listener, Runnable
 		
 		// Command Sender
 		if (senderObject instanceof CommandSender) return getIdFromSender((CommandSender) senderObject);
+
+		// OfflinePlayer
+		// Handled at "Data"
 		
 		// UUID
 		if (senderObject instanceof UUID) return getIdFromUuid((UUID) senderObject);