From aca83bd462fb613f8c94b8ffaccb4b37e640f7bf Mon Sep 17 00:00:00 2001
From: md678685 <mathew678@hotmail.co.uk>
Date: Wed, 20 Feb 2019 11:28:20 +0000
Subject: [PATCH] Switch Vault dependency to VaultAPI (#2430)

* Switch Vault dependency to VaultAPI
* Remove direct Vault class usage from VaultEco
---
 Essentials/pom.xml                                       | 4 ++--
 .../essentials/register/payment/methods/VaultEco.java    | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Essentials/pom.xml b/Essentials/pom.xml
index 055298cd2..a0401ec2a 100644
--- a/Essentials/pom.xml
+++ b/Essentials/pom.xml
@@ -44,8 +44,8 @@
     <dependencies>
         <dependency>
             <groupId>net.milkbowl.vault</groupId>
-            <artifactId>Vault</artifactId>
-            <version>1.5.6</version>
+            <artifactId>VaultAPI</artifactId>
+            <version>1.7</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/Essentials/src/com/earth2me/essentials/register/payment/methods/VaultEco.java b/Essentials/src/com/earth2me/essentials/register/payment/methods/VaultEco.java
index dc9af2f92..7d83bc341 100644
--- a/Essentials/src/com/earth2me/essentials/register/payment/methods/VaultEco.java
+++ b/Essentials/src/com/earth2me/essentials/register/payment/methods/VaultEco.java
@@ -1,18 +1,17 @@
 package com.earth2me.essentials.register.payment.methods;
 
 import com.earth2me.essentials.register.payment.Method;
-import net.milkbowl.vault.Vault;
 import net.milkbowl.vault.economy.Economy;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.RegisteredServiceProvider;
 
 
 public class VaultEco implements Method {
-    private Vault vault;
+    private Plugin vault;
     private Economy economy;
 
     @Override
-    public Vault getPlugin() {
+    public Plugin getPlugin() {
         return this.vault;
     }
 
@@ -108,7 +107,7 @@ public class VaultEco implements Method {
     public boolean isCompatible(Plugin plugin) {
         try {
             RegisteredServiceProvider<Economy> ecoPlugin = plugin.getServer().getServicesManager().getRegistration(net.milkbowl.vault.economy.Economy.class);
-            return plugin instanceof Vault && ecoPlugin != null && !ecoPlugin.getProvider().getName().equals("Essentials Economy");
+            return plugin.getName().equals("Vault") && ecoPlugin != null && !ecoPlugin.getProvider().getName().equals("Essentials Economy");
         } catch (LinkageError | Exception e) {
             return false;
         }
@@ -116,7 +115,7 @@ public class VaultEco implements Method {
 
     @Override
     public void setPlugin(Plugin plugin) {
-        this.vault = (Vault) plugin;
+        this.vault = plugin;
         RegisteredServiceProvider<Economy> economyProvider = this.vault.getServer().getServicesManager().getRegistration(net.milkbowl.vault.economy.Economy.class);
         if (economyProvider != null) {
             this.economy = economyProvider.getProvider();