diff --git a/lib/SDFEconomy-0.2.2.jar b/lib/SDFEconomy-0.2.2.jar
new file mode 100644
index 0000000..58fcaac
Binary files /dev/null and b/lib/SDFEconomy-0.2.2.jar differ
diff --git a/lib/bpermissions2.jar b/lib/bpermissions2.jar
deleted file mode 100644
index 5a74204..0000000
Binary files a/lib/bpermissions2.jar and /dev/null differ
diff --git a/lib/bpermissions25.jar b/lib/bpermissions25.jar
new file mode 100644
index 0000000..1edc2f9
Binary files /dev/null and b/lib/bpermissions25.jar differ
diff --git a/lib/craftconomy3.jar b/lib/craftconomy3.jar
index 06d4258..fe665e5 100644
Binary files a/lib/craftconomy3.jar and b/lib/craftconomy3.jar differ
diff --git a/plugin.yml b/plugin.yml
index 1e9cccf..34aeb7f 100644
--- a/plugin.yml
+++ b/plugin.yml
@@ -1,6 +1,6 @@
name: Vault
main: net.milkbowl.vault.Vault
-version: 1.2.24-b${BUILD_NUMBER}
+version: 1.2.25-b${BUILD_NUMBER}
authors: [cereal, Sleaker, mung3r]
website: http://dev.bukkit.org/server-mods/vault
load: startup
diff --git a/pom.xml b/pom.xml
index a9bd84a..f8d2843 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
4.0.0
net.milkbowl.vault
Vault
- 1.2.24-SNAPSHOT
+ 1.2.25-SNAPSHOT
UTF-8
@@ -210,9 +210,9 @@
de.bananaco.permissions.Permissions
bPermissions2
- 2.9.12d
+ 2.10.5
system
- ${project.basedir}/lib/bpermissions2.jar
+ ${project.basedir}/lib/bpermissions25.jar
com.dthielke.starburst
@@ -238,7 +238,7 @@
com.greatmancode
craftconomy3
- 3.1.0-SNAPSHOT
+ 3.1.2
net.crystalyx.bukkit.simplyperms
@@ -275,6 +275,7 @@
+ clean install
src/
diff --git a/src/net/milkbowl/vault/economy/Economy.java b/src/net/milkbowl/vault/economy/Economy.java
index 20d6d95..7130f92 100644
--- a/src/net/milkbowl/vault/economy/Economy.java
+++ b/src/net/milkbowl/vault/economy/Economy.java
@@ -85,6 +85,14 @@ public interface Economy {
*/
public boolean hasAccount(String playerName);
+ /**
+ * Checks if this player has an account on the server yet on the given world
+ * This will always return true if the player has joined the server at least once
+ * as all major economy plugins auto-generate a player account when the player joins the server
+ * @param playerName
+ * @return if the player has an account
+ */
+ public boolean hasAccount(String playerName, String worldName);
/**
* Gets balance of a player
@@ -92,6 +100,15 @@ public interface Economy {
* @return Amount currently held in players account
*/
public double getBalance(String playerName);
+
+ /**
+ * Gets balance of a player on the specified world.
+ * IMPLEMENTATION SPECIFIC - if an economy plugin does not support this the global balance will be returned.
+ * @param playerName
+ * @param world name of the world
+ * @return Amount currently held in players account
+ */
+ public double getBalance(String playerName, String world);
/**
* Checks if the player account has the amount - DO NOT USE NEGATIVE AMOUNTS
@@ -102,6 +119,16 @@ public interface Economy {
*/
public boolean has(String playerName, double amount);
+ /**
+ * Checks if the player account has the amount in a given world - DO NOT USE NEGATIVE AMOUNTS
+ * IMPLEMENTATION SPECIFIC - if an economy plugin does not support this the global balance will be returned.
+ * @param playerName
+ * @param worldName
+ * @param amount
+ * @return True if playerName has amount, False else wise
+ */
+ public boolean has(String playerName, String worldName, double amount);
+
/**
* Withdraw an amount from a player - DO NOT USE NEGATIVE AMOUNTS
*
@@ -111,6 +138,16 @@ public interface Economy {
*/
public EconomyResponse withdrawPlayer(String playerName, double amount);
+ /**
+ * Withdraw an amount from a player on a given world - DO NOT USE NEGATIVE AMOUNTS
+ * IMPLEMENTATION SPECIFIC - if an economy plugin does not support this the global balance will be returned.
+ * @param playerName Name of player
+ * @param worldName - name of the world
+ * @param amount Amount to withdraw
+ * @return Detailed response of transaction
+ */
+ public EconomyResponse withdrawPlayer(String playerName, String worldName, double amount);
+
/**
* Deposit an amount to a player - DO NOT USE NEGATIVE AMOUNTS
*
@@ -120,6 +157,15 @@ public interface Economy {
*/
public EconomyResponse depositPlayer(String playerName, double amount);
+ /**
+ * Deposit an amount to a player - DO NOT USE NEGATIVE AMOUNTS
+ * IMPLEMENTATION SPECIFIC - if an economy plugin does not support this the global balance will be returned.
+ * @param playerName Name of player
+ * @param amount Amount to deposit
+ * @return Detailed response of transaction
+ */
+ public EconomyResponse depositPlayer(String playerName, String worldName, double amount);
+
/**
* Creates a bank account with the specified name and the player as the owner
* @param name
@@ -196,4 +242,11 @@ public interface Economy {
* @return if the account creation was successful
*/
public boolean createPlayerAccount(String playerName);
+
+ /**
+ * Attempts to create a player account for the given player on the specified world
+ * IMPLEMENTATION SPECIFIC - if an economy plugin does not support this the global balance will be returned.
+ * @return if the account creation was successful
+ */
+ public boolean createPlayerAccount(String playerName, String worldName);
}
diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_3co.java b/src/net/milkbowl/vault/economy/plugins/Economy_3co.java
index ad1e8ea..60703ed 100644
--- a/src/net/milkbowl/vault/economy/plugins/Economy_3co.java
+++ b/src/net/milkbowl/vault/economy/plugins/Economy_3co.java
@@ -260,4 +260,34 @@ public class Economy_3co implements Economy {
public int fractionalDigits() {
return 0;
}
+
+ @Override
+ public boolean hasAccount(String playerName, String worldName) {
+ return hasAccount(playerName);
+ }
+
+ @Override
+ public double getBalance(String playerName, String world) {
+ return getBalance(playerName);
+ }
+
+ @Override
+ public boolean has(String playerName, String worldName, double amount) {
+ return has(playerName, amount);
+ }
+
+ @Override
+ public EconomyResponse withdrawPlayer(String playerName, String worldName, double amount) {
+ return withdrawPlayer(playerName, amount);
+ }
+
+ @Override
+ public EconomyResponse depositPlayer(String playerName, String worldName, double amount) {
+ return depositPlayer(playerName, amount);
+ }
+
+ @Override
+ public boolean createPlayerAccount(String playerName, String worldName) {
+ return createPlayerAccount(playerName);
+ }
}
diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_AEco.java b/src/net/milkbowl/vault/economy/plugins/Economy_AEco.java
index a4aaa88..7b77ca7 100644
--- a/src/net/milkbowl/vault/economy/plugins/Economy_AEco.java
+++ b/src/net/milkbowl/vault/economy/plugins/Economy_AEco.java
@@ -235,4 +235,34 @@ public class Economy_AEco implements Economy {
public int fractionalDigits() {
return 0;
}
+
+ @Override
+ public boolean hasAccount(String playerName, String worldName) {
+ return hasAccount(playerName);
+ }
+
+ @Override
+ public double getBalance(String playerName, String world) {
+ return getBalance(playerName);
+ }
+
+ @Override
+ public boolean has(String playerName, String worldName, double amount) {
+ return has(playerName, amount);
+ }
+
+ @Override
+ public EconomyResponse withdrawPlayer(String playerName, String worldName, double amount) {
+ return withdrawPlayer(playerName, amount);
+ }
+
+ @Override
+ public EconomyResponse depositPlayer(String playerName, String worldName, double amount) {
+ return depositPlayer(playerName, amount);
+ }
+
+ @Override
+ public boolean createPlayerAccount(String playerName, String worldName) {
+ return createPlayerAccount(playerName);
+ }
}
diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_BOSE6.java b/src/net/milkbowl/vault/economy/plugins/Economy_BOSE6.java
index a08e53e..df70b30 100644
--- a/src/net/milkbowl/vault/economy/plugins/Economy_BOSE6.java
+++ b/src/net/milkbowl/vault/economy/plugins/Economy_BOSE6.java
@@ -308,4 +308,35 @@ public class Economy_BOSE6 implements Economy {
public int fractionalDigits() {
return 0;
}
+
+
+ @Override
+ public boolean hasAccount(String playerName, String worldName) {
+ return hasAccount(playerName);
+ }
+
+ @Override
+ public double getBalance(String playerName, String world) {
+ return getBalance(playerName);
+ }
+
+ @Override
+ public boolean has(String playerName, String worldName, double amount) {
+ return has(playerName, amount);
+ }
+
+ @Override
+ public EconomyResponse withdrawPlayer(String playerName, String worldName, double amount) {
+ return withdrawPlayer(playerName, amount);
+ }
+
+ @Override
+ public EconomyResponse depositPlayer(String playerName, String worldName, double amount) {
+ return depositPlayer(playerName, amount);
+ }
+
+ @Override
+ public boolean createPlayerAccount(String playerName, String worldName) {
+ return createPlayerAccount(playerName);
+ }
}
diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_BOSE7.java b/src/net/milkbowl/vault/economy/plugins/Economy_BOSE7.java
index 6353617..a612a77 100644
--- a/src/net/milkbowl/vault/economy/plugins/Economy_BOSE7.java
+++ b/src/net/milkbowl/vault/economy/plugins/Economy_BOSE7.java
@@ -271,4 +271,35 @@ public class Economy_BOSE7 implements Economy {
public int fractionalDigits() {
return economy.getFractionalDigits();
}
+
+
+ @Override
+ public boolean hasAccount(String playerName, String worldName) {
+ return hasAccount(playerName);
+ }
+
+ @Override
+ public double getBalance(String playerName, String world) {
+ return getBalance(playerName);
+ }
+
+ @Override
+ public boolean has(String playerName, String worldName, double amount) {
+ return has(playerName, amount);
+ }
+
+ @Override
+ public EconomyResponse withdrawPlayer(String playerName, String worldName, double amount) {
+ return withdrawPlayer(playerName, amount);
+ }
+
+ @Override
+ public EconomyResponse depositPlayer(String playerName, String worldName, double amount) {
+ return depositPlayer(playerName, amount);
+ }
+
+ @Override
+ public boolean createPlayerAccount(String playerName, String worldName) {
+ return createPlayerAccount(playerName);
+ }
}
diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_CommandsEX.java b/src/net/milkbowl/vault/economy/plugins/Economy_CommandsEX.java
index 78a621b..03d8dfe 100644
--- a/src/net/milkbowl/vault/economy/plugins/Economy_CommandsEX.java
+++ b/src/net/milkbowl/vault/economy/plugins/Economy_CommandsEX.java
@@ -201,4 +201,33 @@ public class Economy_CommandsEX implements net.milkbowl.vault.economy.Economy {
}
}
+ @Override
+ public boolean hasAccount(String playerName, String worldName) {
+ return hasAccount(playerName);
+ }
+
+ @Override
+ public double getBalance(String playerName, String world) {
+ return getBalance(playerName);
+ }
+
+ @Override
+ public boolean has(String playerName, String worldName, double amount) {
+ return has(playerName, amount);
+ }
+
+ @Override
+ public EconomyResponse withdrawPlayer(String playerName, String worldName, double amount) {
+ return withdrawPlayer(playerName, amount);
+ }
+
+ @Override
+ public EconomyResponse depositPlayer(String playerName, String worldName, double amount) {
+ return depositPlayer(playerName, amount);
+ }
+
+ @Override
+ public boolean createPlayerAccount(String playerName, String worldName) {
+ return createPlayerAccount(playerName);
+ }
}
diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_Craftconomy.java b/src/net/milkbowl/vault/economy/plugins/Economy_Craftconomy.java
index 0165661..7308905 100644
--- a/src/net/milkbowl/vault/economy/plugins/Economy_Craftconomy.java
+++ b/src/net/milkbowl/vault/economy/plugins/Economy_Craftconomy.java
@@ -295,4 +295,34 @@ public class Economy_Craftconomy implements Economy {
public int fractionalDigits() {
return -1;
}
+
+ @Override
+ public boolean hasAccount(String playerName, String worldName) {
+ return hasAccount(playerName);
+ }
+
+ @Override
+ public double getBalance(String playerName, String world) {
+ return getBalance(playerName);
+ }
+
+ @Override
+ public boolean has(String playerName, String worldName, double amount) {
+ return has(playerName, amount);
+ }
+
+ @Override
+ public EconomyResponse withdrawPlayer(String playerName, String worldName, double amount) {
+ return withdrawPlayer(playerName, amount);
+ }
+
+ @Override
+ public EconomyResponse depositPlayer(String playerName, String worldName, double amount) {
+ return depositPlayer(playerName, amount);
+ }
+
+ @Override
+ public boolean createPlayerAccount(String playerName, String worldName) {
+ return createPlayerAccount(playerName);
+ }
}
\ No newline at end of file
diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_Craftconomy3.java b/src/net/milkbowl/vault/economy/plugins/Economy_Craftconomy3.java
index a147261..bb57f15 100644
--- a/src/net/milkbowl/vault/economy/plugins/Economy_Craftconomy3.java
+++ b/src/net/milkbowl/vault/economy/plugins/Economy_Craftconomy3.java
@@ -35,12 +35,11 @@ import org.bukkit.plugin.Plugin;
import com.greatmancode.craftconomy3.BukkitLoader;
import com.greatmancode.craftconomy3.Common;
import com.greatmancode.craftconomy3.account.Account;
-import com.greatmancode.craftconomy3.currency.CurrencyManager;
import com.greatmancode.craftconomy3.database.tables.AccountTable;
+import com.greatmancode.craftconomy3.groups.WorldGroupsManager;
public class Economy_Craftconomy3 implements Economy {
private static final Logger log = Logger.getLogger("Minecraft");
-
private final String name = "Craftconomy3";
private Plugin plugin = null;
protected BukkitLoader economy = null;
@@ -120,40 +119,22 @@ public class Economy_Craftconomy3 implements Economy {
@Override
public double getBalance(String playerName) {
- return Common.getInstance().getAccountManager().getAccount(playerName).getBalance(Common.getInstance().getServerCaller().getDefaultWorld(), Common.getInstance().getCurrencyManager().getDefaultCurrency().getName());
+ return getBalance(playerName, WorldGroupsManager.DEFAULT_GROUP_NAME);
}
@Override
public EconomyResponse withdrawPlayer(String playerName, double amount) {
- if (amount < 0) {
- return new EconomyResponse(0, getBalance(playerName), ResponseType.FAILURE, "Cannot withdraw negative funds");
- }
-
- double balance;
- Account account = Common.getInstance().getAccountManager().getAccount(playerName);
- if (account.hasEnough(amount, Common.getInstance().getServerCaller().getDefaultWorld(), Common.getInstance().getCurrencyManager().getDefaultCurrency().getName())) {
- balance = account.withdraw(amount, Common.getInstance().getServerCaller().getDefaultWorld(), Common.getInstance().getCurrencyManager().getDefaultCurrency().getName());
- return new EconomyResponse(amount, balance, ResponseType.SUCCESS, "");
- } else {
- return new EconomyResponse(0, getBalance(playerName), ResponseType.FAILURE, "Insufficient funds");
- }
+ return withdrawPlayer(playerName, WorldGroupsManager.DEFAULT_GROUP_NAME, amount);
}
@Override
public EconomyResponse depositPlayer(String playerName, double amount) {
- if (amount < 0) {
- return new EconomyResponse(0, getBalance(playerName), ResponseType.FAILURE, "Cannot desposit negative funds");
- }
-
- Account account = Common.getInstance().getAccountManager().getAccount(playerName);
-
- double balance = account.deposit(amount, Common.getInstance().getServerCaller().getDefaultWorld(), Common.getInstance().getCurrencyManager().getDefaultCurrency().getName());
- return new EconomyResponse(amount, balance, ResponseType.SUCCESS, null);
+ return depositPlayer(playerName, WorldGroupsManager.DEFAULT_GROUP_NAME, amount);
}
@Override
public boolean has(String playerName, double amount) {
- return getBalance(playerName) >= amount;
+ return has(playerName, WorldGroupsManager.DEFAULT_GROUP_NAME, amount);
}
@Override
@@ -201,15 +182,14 @@ public class Economy_Craftconomy3 implements Economy {
}
EconomyResponse er = bankHas(name, amount);
- if (!er.transactionSuccess())
+ if (!er.transactionSuccess()) {
return er;
- else {
+ } else {
if (Common.getInstance().getAccountManager().exist(Account.BANK_PREFIX + name)) {
return new EconomyResponse(0, withdrawPlayer(Account.BANK_PREFIX + name, amount).balance, ResponseType.SUCCESS, "");
}
return new EconomyResponse(0, 0, ResponseType.FAILURE, "That bank does not exist!");
}
-
}
@Override
@@ -240,9 +220,9 @@ public class Economy_Craftconomy3 implements Economy {
// Basicly here if the user have access to deposit & withdraw he's a member
EconomyResponse er = isBankOwner(name, playerName);
- if (er.transactionSuccess())
+ if (er.transactionSuccess()) {
return er;
- else {
+ } else {
if (Common.getInstance().getAccountManager().exist(Account.BANK_PREFIX + name)) {
Account account = Common.getInstance().getAccountManager().getAccount(Account.BANK_PREFIX + name);
if (account.getAccountACL().canDeposit(playerName) && account.getAccountACL().canWithdraw(playerName)) {
@@ -270,7 +250,6 @@ public class Economy_Craftconomy3 implements Economy {
list.add(iterator.next().getName().replaceFirst(Account.BANK_PREFIX, ""));
}
return list;
-
}
@Override
@@ -296,4 +275,52 @@ public class Economy_Craftconomy3 implements Economy {
public int fractionalDigits() {
return -1;
}
+
+ @Override
+ public boolean hasAccount(String playerName, String worldName) {
+ return hasAccount(playerName);
+ }
+
+ @Override
+ public double getBalance(String playerName, String world) {
+ return Common.getInstance().getAccountManager().getAccount(playerName).getBalance(world, Common.getInstance().getCurrencyManager().getDefaultCurrency().getName());
+ }
+
+ @Override
+ public boolean has(String playerName, String worldName, double amount) {
+ return getBalance(playerName, worldName) >= amount;
+ }
+
+ @Override
+ public EconomyResponse withdrawPlayer(String playerName, String worldName, double amount) {
+ if (amount < 0) {
+ return new EconomyResponse(0, getBalance(playerName, worldName), ResponseType.FAILURE, "Cannot withdraw negative funds");
+ }
+
+ double balance;
+ Account account = Common.getInstance().getAccountManager().getAccount(playerName);
+ if (account.hasEnough(amount, worldName, Common.getInstance().getCurrencyManager().getDefaultCurrency().getName())) {
+ balance = account.withdraw(amount, worldName, Common.getInstance().getCurrencyManager().getDefaultCurrency().getName());
+ return new EconomyResponse(amount, balance, ResponseType.SUCCESS, "");
+ } else {
+ return new EconomyResponse(0, getBalance(playerName, worldName), ResponseType.FAILURE, "Insufficient funds");
+ }
+ }
+
+ @Override
+ public EconomyResponse depositPlayer(String playerName, String worldName, double amount) {
+ if (amount < 0) {
+ return new EconomyResponse(0, getBalance(playerName, worldName), ResponseType.FAILURE, "Cannot desposit negative funds");
+ }
+
+ Account account = Common.getInstance().getAccountManager().getAccount(playerName);
+
+ double balance = account.deposit(amount, worldName, Common.getInstance().getCurrencyManager().getDefaultCurrency().getName());
+ return new EconomyResponse(amount, balance, ResponseType.SUCCESS, null);
+ }
+
+ @Override
+ public boolean createPlayerAccount(String playerName, String worldName) {
+ return createPlayerAccount(playerName);
+ }
}
\ No newline at end of file
diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_CurrencyCore.java b/src/net/milkbowl/vault/economy/plugins/Economy_CurrencyCore.java
index e00996a..af9ebbc 100644
--- a/src/net/milkbowl/vault/economy/plugins/Economy_CurrencyCore.java
+++ b/src/net/milkbowl/vault/economy/plugins/Economy_CurrencyCore.java
@@ -270,4 +270,34 @@ public class Economy_CurrencyCore implements Economy {
public int fractionalDigits() {
return -1;
}
+
+ @Override
+ public boolean hasAccount(String playerName, String worldName) {
+ return hasAccount(playerName);
+ }
+
+ @Override
+ public double getBalance(String playerName, String world) {
+ return getBalance(playerName);
+ }
+
+ @Override
+ public boolean has(String playerName, String worldName, double amount) {
+ return has(playerName, amount);
+ }
+
+ @Override
+ public EconomyResponse withdrawPlayer(String playerName, String worldName, double amount) {
+ return withdrawPlayer(playerName, amount);
+ }
+
+ @Override
+ public EconomyResponse depositPlayer(String playerName, String worldName, double amount) {
+ return depositPlayer(playerName, amount);
+ }
+
+ @Override
+ public boolean createPlayerAccount(String playerName, String worldName) {
+ return createPlayerAccount(playerName);
+ }
}
diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_Dosh.java b/src/net/milkbowl/vault/economy/plugins/Economy_Dosh.java
index 60baf68..eb7f7a7 100644
--- a/src/net/milkbowl/vault/economy/plugins/Economy_Dosh.java
+++ b/src/net/milkbowl/vault/economy/plugins/Economy_Dosh.java
@@ -163,4 +163,33 @@ public class Economy_Dosh implements Economy {
public class DoshAPIHandler extends MoneyUtils {}
+ @Override
+ public boolean hasAccount(String playerName, String worldName) {
+ return hasAccount(playerName);
+ }
+
+ @Override
+ public double getBalance(String playerName, String world) {
+ return getBalance(playerName);
+ }
+
+ @Override
+ public boolean has(String playerName, String worldName, double amount) {
+ return has(playerName, amount);
+ }
+
+ @Override
+ public EconomyResponse withdrawPlayer(String playerName, String worldName, double amount) {
+ return withdrawPlayer(playerName, amount);
+ }
+
+ @Override
+ public EconomyResponse depositPlayer(String playerName, String worldName, double amount) {
+ return depositPlayer(playerName, amount);
+ }
+
+ @Override
+ public boolean createPlayerAccount(String playerName, String worldName) {
+ return createPlayerAccount(playerName);
+ }
}
diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_EconXP.java b/src/net/milkbowl/vault/economy/plugins/Economy_EconXP.java
index 308d340..841af6f 100644
--- a/src/net/milkbowl/vault/economy/plugins/Economy_EconXP.java
+++ b/src/net/milkbowl/vault/economy/plugins/Economy_EconXP.java
@@ -242,4 +242,35 @@ public class Economy_EconXP implements Economy {
public int fractionalDigits() {
return 0;
}
+
+
+ @Override
+ public boolean hasAccount(String playerName, String worldName) {
+ return hasAccount(playerName);
+ }
+
+ @Override
+ public double getBalance(String playerName, String world) {
+ return getBalance(playerName);
+ }
+
+ @Override
+ public boolean has(String playerName, String worldName, double amount) {
+ return has(playerName, amount);
+ }
+
+ @Override
+ public EconomyResponse withdrawPlayer(String playerName, String worldName, double amount) {
+ return withdrawPlayer(playerName, amount);
+ }
+
+ @Override
+ public EconomyResponse depositPlayer(String playerName, String worldName, double amount) {
+ return depositPlayer(playerName, amount);
+ }
+
+ @Override
+ public boolean createPlayerAccount(String playerName, String worldName) {
+ return createPlayerAccount(playerName);
+ }
}
diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_Essentials.java b/src/net/milkbowl/vault/economy/plugins/Economy_Essentials.java
index 96520e0..4fc8b06 100644
--- a/src/net/milkbowl/vault/economy/plugins/Economy_Essentials.java
+++ b/src/net/milkbowl/vault/economy/plugins/Economy_Essentials.java
@@ -285,4 +285,34 @@ public class Economy_Essentials implements Economy {
public int fractionalDigits() {
return -1;
}
+
+ @Override
+ public boolean hasAccount(String playerName, String worldName) {
+ return hasAccount(playerName);
+ }
+
+ @Override
+ public double getBalance(String playerName, String world) {
+ return getBalance(playerName);
+ }
+
+ @Override
+ public boolean has(String playerName, String worldName, double amount) {
+ return has(playerName, amount);
+ }
+
+ @Override
+ public EconomyResponse withdrawPlayer(String playerName, String worldName, double amount) {
+ return withdrawPlayer(playerName, amount);
+ }
+
+ @Override
+ public EconomyResponse depositPlayer(String playerName, String worldName, double amount) {
+ return depositPlayer(playerName, amount);
+ }
+
+ @Override
+ public boolean createPlayerAccount(String playerName, String worldName) {
+ return createPlayerAccount(playerName);
+ }
}
\ No newline at end of file
diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_GoldIsMoney.java b/src/net/milkbowl/vault/economy/plugins/Economy_GoldIsMoney.java
index 2003e4d..2bcf420 100644
--- a/src/net/milkbowl/vault/economy/plugins/Economy_GoldIsMoney.java
+++ b/src/net/milkbowl/vault/economy/plugins/Economy_GoldIsMoney.java
@@ -214,4 +214,34 @@ public class Economy_GoldIsMoney implements Economy {
public int fractionalDigits() {
return 0;
}
+
+ @Override
+ public boolean hasAccount(String playerName, String worldName) {
+ return hasAccount(playerName);
+ }
+
+ @Override
+ public double getBalance(String playerName, String world) {
+ return getBalance(playerName);
+ }
+
+ @Override
+ public boolean has(String playerName, String worldName, double amount) {
+ return has(playerName, amount);
+ }
+
+ @Override
+ public EconomyResponse withdrawPlayer(String playerName, String worldName, double amount) {
+ return withdrawPlayer(playerName, amount);
+ }
+
+ @Override
+ public EconomyResponse depositPlayer(String playerName, String worldName, double amount) {
+ return depositPlayer(playerName, amount);
+ }
+
+ @Override
+ public boolean createPlayerAccount(String playerName, String worldName) {
+ return createPlayerAccount(playerName);
+ }
}
\ No newline at end of file
diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_GoldIsMoney2.java b/src/net/milkbowl/vault/economy/plugins/Economy_GoldIsMoney2.java
index 2368cef..d8046e2 100644
--- a/src/net/milkbowl/vault/economy/plugins/Economy_GoldIsMoney2.java
+++ b/src/net/milkbowl/vault/economy/plugins/Economy_GoldIsMoney2.java
@@ -283,4 +283,34 @@ public class Economy_GoldIsMoney2 implements Economy {
}
}
}
+
+ @Override
+ public boolean hasAccount(String playerName, String worldName) {
+ return hasAccount(playerName);
+ }
+
+ @Override
+ public double getBalance(String playerName, String world) {
+ return getBalance(playerName);
+ }
+
+ @Override
+ public boolean has(String playerName, String worldName, double amount) {
+ return has(playerName, amount);
+ }
+
+ @Override
+ public EconomyResponse withdrawPlayer(String playerName, String worldName, double amount) {
+ return withdrawPlayer(playerName, amount);
+ }
+
+ @Override
+ public EconomyResponse depositPlayer(String playerName, String worldName, double amount) {
+ return depositPlayer(playerName, amount);
+ }
+
+ @Override
+ public boolean createPlayerAccount(String playerName, String worldName) {
+ return createPlayerAccount(playerName);
+ }
}
\ No newline at end of file
diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_Gringotts.java b/src/net/milkbowl/vault/economy/plugins/Economy_Gringotts.java
index a044586..147428c 100644
--- a/src/net/milkbowl/vault/economy/plugins/Economy_Gringotts.java
+++ b/src/net/milkbowl/vault/economy/plugins/Economy_Gringotts.java
@@ -238,4 +238,34 @@ public class Economy_Gringotts implements Economy {
public boolean createPlayerAccount(String playerName) {
return hasAccount(playerName);
}
+
+ @Override
+ public boolean hasAccount(String playerName, String worldName) {
+ return hasAccount(playerName);
+ }
+
+ @Override
+ public double getBalance(String playerName, String world) {
+ return getBalance(playerName);
+ }
+
+ @Override
+ public boolean has(String playerName, String worldName, double amount) {
+ return has(playerName, amount);
+ }
+
+ @Override
+ public EconomyResponse withdrawPlayer(String playerName, String worldName, double amount) {
+ return withdrawPlayer(playerName, amount);
+ }
+
+ @Override
+ public EconomyResponse depositPlayer(String playerName, String worldName, double amount) {
+ return depositPlayer(playerName, amount);
+ }
+
+ @Override
+ public boolean createPlayerAccount(String playerName, String worldName) {
+ return createPlayerAccount(playerName);
+ }
}
diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_McMoney.java b/src/net/milkbowl/vault/economy/plugins/Economy_McMoney.java
index 3df4fbe..12fa84a 100644
--- a/src/net/milkbowl/vault/economy/plugins/Economy_McMoney.java
+++ b/src/net/milkbowl/vault/economy/plugins/Economy_McMoney.java
@@ -214,4 +214,34 @@ public class Economy_McMoney implements Economy {
public int fractionalDigits() {
return -1;
}
+
+ @Override
+ public boolean hasAccount(String playerName, String worldName) {
+ return hasAccount(playerName);
+ }
+
+ @Override
+ public double getBalance(String playerName, String world) {
+ return getBalance(playerName);
+ }
+
+ @Override
+ public boolean has(String playerName, String worldName, double amount) {
+ return has(playerName, amount);
+ }
+
+ @Override
+ public EconomyResponse withdrawPlayer(String playerName, String worldName, double amount) {
+ return withdrawPlayer(playerName, amount);
+ }
+
+ @Override
+ public EconomyResponse depositPlayer(String playerName, String worldName, double amount) {
+ return depositPlayer(playerName, amount);
+ }
+
+ @Override
+ public boolean createPlayerAccount(String playerName, String worldName) {
+ return createPlayerAccount(playerName);
+ }
}
diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_MineConomy.java b/src/net/milkbowl/vault/economy/plugins/Economy_MineConomy.java
index af80f06..385bccf 100644
--- a/src/net/milkbowl/vault/economy/plugins/Economy_MineConomy.java
+++ b/src/net/milkbowl/vault/economy/plugins/Economy_MineConomy.java
@@ -239,4 +239,34 @@ public class Economy_MineConomy implements Economy {
public int fractionalDigits() {
return 2;
}
+
+ @Override
+ public boolean hasAccount(String playerName, String worldName) {
+ return hasAccount(playerName);
+ }
+
+ @Override
+ public double getBalance(String playerName, String world) {
+ return getBalance(playerName);
+ }
+
+ @Override
+ public boolean has(String playerName, String worldName, double amount) {
+ return has(playerName, amount);
+ }
+
+ @Override
+ public EconomyResponse withdrawPlayer(String playerName, String worldName, double amount) {
+ return withdrawPlayer(playerName, amount);
+ }
+
+ @Override
+ public EconomyResponse depositPlayer(String playerName, String worldName, double amount) {
+ return depositPlayer(playerName, amount);
+ }
+
+ @Override
+ public boolean createPlayerAccount(String playerName, String worldName) {
+ return createPlayerAccount(playerName);
+ }
}
diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_MultiCurrency.java b/src/net/milkbowl/vault/economy/plugins/Economy_MultiCurrency.java
index 25f3d35..c76824e 100644
--- a/src/net/milkbowl/vault/economy/plugins/Economy_MultiCurrency.java
+++ b/src/net/milkbowl/vault/economy/plugins/Economy_MultiCurrency.java
@@ -261,4 +261,34 @@ public class Economy_MultiCurrency implements Economy {
public int fractionalDigits() {
return -1;
}
+
+ @Override
+ public boolean hasAccount(String playerName, String worldName) {
+ return hasAccount(playerName);
+ }
+
+ @Override
+ public double getBalance(String playerName, String world) {
+ return getBalance(playerName);
+ }
+
+ @Override
+ public boolean has(String playerName, String worldName, double amount) {
+ return has(playerName, amount);
+ }
+
+ @Override
+ public EconomyResponse withdrawPlayer(String playerName, String worldName, double amount) {
+ return withdrawPlayer(playerName, amount);
+ }
+
+ @Override
+ public EconomyResponse depositPlayer(String playerName, String worldName, double amount) {
+ return depositPlayer(playerName, amount);
+ }
+
+ @Override
+ public boolean createPlayerAccount(String playerName, String worldName) {
+ return createPlayerAccount(playerName);
+ }
}
diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_SDFEconomy.java b/src/net/milkbowl/vault/economy/plugins/Economy_SDFEconomy.java
index 2f12ae4..361a177 100644
--- a/src/net/milkbowl/vault/economy/plugins/Economy_SDFEconomy.java
+++ b/src/net/milkbowl/vault/economy/plugins/Economy_SDFEconomy.java
@@ -196,5 +196,34 @@ public class Economy_SDFEconomy implements Economy {
public boolean createPlayerAccount(String playerName) {
return api.createPlayerAccount(playerName);
}
-
+
+ @Override
+ public boolean hasAccount(String playerName, String worldName) {
+ return hasAccount(playerName);
+ }
+
+ @Override
+ public double getBalance(String playerName, String world) {
+ return getBalance(playerName);
+ }
+
+ @Override
+ public boolean has(String playerName, String worldName, double amount) {
+ return has(playerName, amount);
+ }
+
+ @Override
+ public EconomyResponse withdrawPlayer(String playerName, String worldName, double amount) {
+ return withdrawPlayer(playerName, amount);
+ }
+
+ @Override
+ public EconomyResponse depositPlayer(String playerName, String worldName, double amount) {
+ return depositPlayer(playerName, amount);
+ }
+
+ @Override
+ public boolean createPlayerAccount(String playerName, String worldName) {
+ return createPlayerAccount(playerName);
+ }
}
diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_XPBank.java b/src/net/milkbowl/vault/economy/plugins/Economy_XPBank.java
index dcf0467..1e361a5 100644
--- a/src/net/milkbowl/vault/economy/plugins/Economy_XPBank.java
+++ b/src/net/milkbowl/vault/economy/plugins/Economy_XPBank.java
@@ -356,4 +356,34 @@ public class Economy_XPBank implements Economy {
return true;
}
+
+ @Override
+ public boolean hasAccount(String playerName, String worldName) {
+ return hasAccount(playerName);
+ }
+
+ @Override
+ public double getBalance(String playerName, String world) {
+ return getBalance(playerName);
+ }
+
+ @Override
+ public boolean has(String playerName, String worldName, double amount) {
+ return has(playerName, amount);
+ }
+
+ @Override
+ public EconomyResponse withdrawPlayer(String playerName, String worldName, double amount) {
+ return withdrawPlayer(playerName, amount);
+ }
+
+ @Override
+ public EconomyResponse depositPlayer(String playerName, String worldName, double amount) {
+ return depositPlayer(playerName, amount);
+ }
+
+ @Override
+ public boolean createPlayerAccount(String playerName, String worldName) {
+ return createPlayerAccount(playerName);
+ }
}
diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_eWallet.java b/src/net/milkbowl/vault/economy/plugins/Economy_eWallet.java
index 8ad9d0a..0534625 100644
--- a/src/net/milkbowl/vault/economy/plugins/Economy_eWallet.java
+++ b/src/net/milkbowl/vault/economy/plugins/Economy_eWallet.java
@@ -220,4 +220,34 @@ public class Economy_eWallet implements Economy {
public int fractionalDigits() {
return 0;
}
+
+ @Override
+ public boolean hasAccount(String playerName, String worldName) {
+ return hasAccount(playerName);
+ }
+
+ @Override
+ public double getBalance(String playerName, String world) {
+ return getBalance(playerName);
+ }
+
+ @Override
+ public boolean has(String playerName, String worldName, double amount) {
+ return has(playerName, amount);
+ }
+
+ @Override
+ public EconomyResponse withdrawPlayer(String playerName, String worldName, double amount) {
+ return withdrawPlayer(playerName, amount);
+ }
+
+ @Override
+ public EconomyResponse depositPlayer(String playerName, String worldName, double amount) {
+ return depositPlayer(playerName, amount);
+ }
+
+ @Override
+ public boolean createPlayerAccount(String playerName, String worldName) {
+ return createPlayerAccount(playerName);
+ }
}
diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_iConomy4.java b/src/net/milkbowl/vault/economy/plugins/Economy_iConomy4.java
index d2c3003..bf214c2 100644
--- a/src/net/milkbowl/vault/economy/plugins/Economy_iConomy4.java
+++ b/src/net/milkbowl/vault/economy/plugins/Economy_iConomy4.java
@@ -265,4 +265,34 @@ public class Economy_iConomy4 implements Economy {
public int fractionalDigits() {
return 2;
}
+
+ @Override
+ public boolean hasAccount(String playerName, String worldName) {
+ return hasAccount(playerName);
+ }
+
+ @Override
+ public double getBalance(String playerName, String world) {
+ return getBalance(playerName);
+ }
+
+ @Override
+ public boolean has(String playerName, String worldName, double amount) {
+ return has(playerName, amount);
+ }
+
+ @Override
+ public EconomyResponse withdrawPlayer(String playerName, String worldName, double amount) {
+ return withdrawPlayer(playerName, amount);
+ }
+
+ @Override
+ public EconomyResponse depositPlayer(String playerName, String worldName, double amount) {
+ return depositPlayer(playerName, amount);
+ }
+
+ @Override
+ public boolean createPlayerAccount(String playerName, String worldName) {
+ return createPlayerAccount(playerName);
+ }
}
\ No newline at end of file
diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_iConomy5.java b/src/net/milkbowl/vault/economy/plugins/Economy_iConomy5.java
index 6759527..f53e16f 100644
--- a/src/net/milkbowl/vault/economy/plugins/Economy_iConomy5.java
+++ b/src/net/milkbowl/vault/economy/plugins/Economy_iConomy5.java
@@ -230,4 +230,34 @@ public class Economy_iConomy5 implements Economy {
public int fractionalDigits() {
return 2;
}
+
+ @Override
+ public boolean hasAccount(String playerName, String worldName) {
+ return hasAccount(playerName);
+ }
+
+ @Override
+ public double getBalance(String playerName, String world) {
+ return getBalance(playerName);
+ }
+
+ @Override
+ public boolean has(String playerName, String worldName, double amount) {
+ return has(playerName, amount);
+ }
+
+ @Override
+ public EconomyResponse withdrawPlayer(String playerName, String worldName, double amount) {
+ return withdrawPlayer(playerName, amount);
+ }
+
+ @Override
+ public EconomyResponse depositPlayer(String playerName, String worldName, double amount) {
+ return depositPlayer(playerName, amount);
+ }
+
+ @Override
+ public boolean createPlayerAccount(String playerName, String worldName) {
+ return createPlayerAccount(playerName);
+ }
}
\ No newline at end of file
diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_iConomy6.java b/src/net/milkbowl/vault/economy/plugins/Economy_iConomy6.java
index 5cec08f..1b4861d 100644
--- a/src/net/milkbowl/vault/economy/plugins/Economy_iConomy6.java
+++ b/src/net/milkbowl/vault/economy/plugins/Economy_iConomy6.java
@@ -259,4 +259,34 @@ public class Economy_iConomy6 implements Economy {
public int fractionalDigits() {
return -1;
}
+
+ @Override
+ public boolean hasAccount(String playerName, String worldName) {
+ return hasAccount(playerName);
+ }
+
+ @Override
+ public double getBalance(String playerName, String world) {
+ return getBalance(playerName);
+ }
+
+ @Override
+ public boolean has(String playerName, String worldName, double amount) {
+ return has(playerName, amount);
+ }
+
+ @Override
+ public EconomyResponse withdrawPlayer(String playerName, String worldName, double amount) {
+ return withdrawPlayer(playerName, amount);
+ }
+
+ @Override
+ public EconomyResponse depositPlayer(String playerName, String worldName, double amount) {
+ return depositPlayer(playerName, amount);
+ }
+
+ @Override
+ public boolean createPlayerAccount(String playerName, String worldName) {
+ return createPlayerAccount(playerName);
+ }
}
diff --git a/src/net/milkbowl/vault/permission/plugins/Permission_Privileges.java b/src/net/milkbowl/vault/permission/plugins/Permission_Privileges.java
index 17b53ab..2252aa0 100644
--- a/src/net/milkbowl/vault/permission/plugins/Permission_Privileges.java
+++ b/src/net/milkbowl/vault/permission/plugins/Permission_Privileges.java
@@ -114,7 +114,7 @@ public class Permission_Privileges extends Permission {
public boolean playerInGroup(String world, String player, String group) {
OfflinePlayer p = Bukkit.getOfflinePlayer(player);
Group g = privs.getGroupManager().getGroup(p);
- return g != null && g.getGroupTree().contains(group);
+ return g != null && g.isMemberOf(group);
}
@Override