From 6ee8466ac0791b585730b7acd7dd42a21ebff856 Mon Sep 17 00:00:00 2001
From: Jeremy Wood <farachan@gmail.com>
Date: Wed, 28 Oct 2015 20:10:03 -0400
Subject: [PATCH] Updated Vault dependency to VaultAPI 1.5. May break backwards
 compatibility with old Vault (Probably pre 1.4)

---
 pom.xml                                        |  8 ++++++--
 .../MultiverseCore/utils/MVEconomist.java      | 18 +++++++++---------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index d3a57eb7..cd3d1322 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,6 +20,10 @@
             <id>spigot</id>
             <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
         </repository>
+        <repository>
+            <id>vault-repo</id>
+            <url>http://nexus.theyeticave.net/content/repositories/pub_releases</url>
+        </repository>
     </repositories>
 
     <pluginRepositories>
@@ -269,8 +273,8 @@
         <!-- Start of Economy Dependency -->
         <dependency>
             <groupId>net.milkbowl.vault</groupId>
-            <artifactId>Vault</artifactId>
-            <version>1.2.27</version>
+            <artifactId>VaultAPI</artifactId>
+            <version>1.5</version>
             <type>jar</type>
             <scope>compile</scope>
         </dependency>
diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/MVEconomist.java b/src/main/java/com/onarandombox/MultiverseCore/utils/MVEconomist.java
index 301fbed7..702428e1 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/utils/MVEconomist.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/utils/MVEconomist.java
@@ -72,7 +72,7 @@ public class MVEconomist {
         if (amount <= 0D) {
             return true;
         } else if (isUsingVault(currency)) {
-            return getVaultHandler().getEconomy().has(player.getName(), amount);
+            return getVaultHandler().getEconomy().has(player, amount);
         } else {
             return ItemEconomy.hasEnough(player, amount, currency);
         }
@@ -99,7 +99,7 @@ public class MVEconomist {
      */
     public void deposit(Player player, double amount, int currency) {
         if (isUsingVault(currency)) {
-            getVaultHandler().getEconomy().depositPlayer(player.getName(), amount);
+            getVaultHandler().getEconomy().depositPlayer(player, amount);
         } else {
             ItemEconomy.deposit(player, amount, currency);
         }
@@ -115,7 +115,7 @@ public class MVEconomist {
      */
     public void withdraw(Player player, double amount, int currency) {
         if (isUsingVault(currency)) {
-            getVaultHandler().getEconomy().withdrawPlayer(player.getName(), amount);
+            getVaultHandler().getEconomy().withdrawPlayer(player, amount);
         } else {
             ItemEconomy.withdraw(player, amount, currency);
         }
@@ -146,9 +146,9 @@ public class MVEconomist {
             throw new IllegalStateException("getBalance is only available when using an economy plugin with Vault");
         }
         if (world != null) {
-            return getVaultHandler().getEconomy().getBalance(player.getName(), world.getName());
+            return getVaultHandler().getEconomy().getBalance(player, world.getName());
         } else {
-            return getVaultHandler().getEconomy().getBalance(player.getName());
+            return getVaultHandler().getEconomy().getBalance(player);
         }
     }
 
@@ -177,11 +177,11 @@ public class MVEconomist {
             throw new IllegalStateException("getBalance is only available when using an economy plugin with Vault");
         }
         if (world != null) {
-            getVaultHandler().getEconomy().withdrawPlayer(player.getName(), world.getName(), getBalance(player, world));
-            getVaultHandler().getEconomy().depositPlayer(player.getName(), world.getName(), amount);
+            getVaultHandler().getEconomy().withdrawPlayer(player, world.getName(), getBalance(player, world));
+            getVaultHandler().getEconomy().depositPlayer(player, world.getName(), amount);
         } else {
-            getVaultHandler().getEconomy().withdrawPlayer(player.getName(), getBalance(player));
-            getVaultHandler().getEconomy().depositPlayer(player.getName(), amount);
+            getVaultHandler().getEconomy().withdrawPlayer(player, getBalance(player));
+            getVaultHandler().getEconomy().depositPlayer(player, amount);
         }
     }