SpigotMC
/
Saber-Factions
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed economy issues

This commit is contained in:
VirtualByte 2014-08-05 12:23:21 +01:00 committed by drtshock
parent 5ebaf5c1b0
commit 09d6102798
2 changed files with 74 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -52,7 +52,7 @@
<dependency> <dependency>
<groupId>net.daboross.vault</groupId> <groupId>net.daboross.vault</groupId>
<artifactId>vault-api</artifactId> <artifactId>vault-api</artifactId>
<version>1.2.27</version> <version>1.3.01</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

95
src/main/java/com/massivecraft/factions/integration/Econ.java
View File

@ -8,13 +8,14 @@ import com.massivecraft.factions.util.RelationUtil;
import net.milkbowl.vault.economy.Economy; import net.milkbowl.vault.economy.Economy;
import net.milkbowl.vault.economy.EconomyResponse; import net.milkbowl.vault.economy.EconomyResponse;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.plugin.RegisteredServiceProvider; import org.bukkit.plugin.RegisteredServiceProvider;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import java.util.UUID;
import java.util.logging.Level; import java.util.logging.Level;
public class Econ { public class Econ {
private static Economy econ = null; private static Economy econ = null;
@ -148,8 +149,23 @@ public class Econ {
return false; return false;
} }
OfflinePlayer fromAcc;
OfflinePlayer toAcc;
if(isUUID(from.getAccountId())) {
fromAcc = Bukkit.getOfflinePlayer(UUID.fromString(from.getAccountId()));
} else {
fromAcc = Bukkit.getOfflinePlayer(from.getAccountId());
}
if(isUUID(to.getAccountId())) {
toAcc = Bukkit.getOfflinePlayer(UUID.fromString(to.getAccountId()));
} else {
toAcc = Bukkit.getOfflinePlayer(to.getAccountId());
}
// Is there enough money for the transaction to happen? // Is there enough money for the transaction to happen?
if (!econ.has(from.getAccountId(), amount)) { if (!econ.has(fromAcc, amount)) {
// There was not enough money to pay // There was not enough money to pay
if (invoker != null && notify) { if (invoker != null && notify) {
invoker.msg("<h>%s<b> can't afford to transfer <h>%s<b> to %s<b>.", from.describeTo(invoker, true), moneyString(amount), to.describeTo(invoker)); invoker.msg("<h>%s<b> can't afford to transfer <h>%s<b> to %s<b>.", from.describeTo(invoker, true), moneyString(amount), to.describeTo(invoker));
@ -159,10 +175,10 @@ public class Econ {
} }
// Transfer money // Transfer money
EconomyResponse erw = econ.withdrawPlayer(from.getAccountId(), amount); EconomyResponse erw = econ.withdrawPlayer(fromAcc, amount);
if (erw.transactionSuccess()) { if (erw.transactionSuccess()) {
EconomyResponse erd = econ.depositPlayer(to.getAccountId(), amount); EconomyResponse erd = econ.depositPlayer(toAcc, amount);
if (erd.transactionSuccess()) { if (erd.transactionSuccess()) {
if (notify) { if (notify) {
sendTransferInfo(invoker, from, to, amount); sendTransferInfo(invoker, from, to, amount);
@ -170,7 +186,7 @@ public class Econ {
return true; return true;
} else { } else {
// transaction failed, refund account // transaction failed, refund account
econ.depositPlayer(from.getAccountId(), amount); econ.depositPlayer(fromAcc, amount);
} }
} }
@ -185,12 +201,12 @@ public class Econ {
public static Set<FPlayer> getFplayers(EconomyParticipator ep) { public static Set<FPlayer> getFplayers(EconomyParticipator ep) {
Set<FPlayer> fplayers = new HashSet<FPlayer>(); Set<FPlayer> fplayers = new HashSet<FPlayer>();
if (ep == null) { if (ep != null) {
// Add nothing if (ep instanceof FPlayer) {
} else if (ep instanceof FPlayer) { fplayers.add((FPlayer) ep);
fplayers.add((FPlayer) ep); } else if (ep instanceof Faction) {
} else if (ep instanceof Faction) { fplayers.addAll(((Faction) ep).getFPlayers());
fplayers.addAll(((Faction) ep).getFPlayers()); }
} }
return fplayers; return fplayers;
@ -226,7 +242,21 @@ public class Econ {
return true; return true;
} }
if (!econ.has(ep.getAccountId(), delta)) { // going the hard way round as econ.has refuses to work.
boolean affordable = false;
double currentBalance;
if(isUUID(ep.getAccountId())) {
currentBalance = econ.getBalance(Bukkit.getOfflinePlayer(UUID.fromString(ep.getAccountId())));
} else {
currentBalance = econ.getBalance(Bukkit.getOfflinePlayer(ep.getAccountId()));
}
if(currentBalance >= delta) {
affordable = true;
}
if (!affordable) {
if (toDoThis != null && !toDoThis.isEmpty()) { if (toDoThis != null && !toDoThis.isEmpty()) {
ep.msg("<h>%s<i> can't afford <h>%s<i> %s.", ep.describeTo(ep, true), moneyString(delta), toDoThis); ep.msg("<h>%s<i> can't afford <h>%s<i> %s.", ep.describeTo(ep, true), moneyString(delta), toDoThis);
} }
@ -240,7 +270,14 @@ public class Econ {
return false; return false;
} }
String acc = ep.getAccountId(); OfflinePlayer acc;
if(isUUID(ep.getAccountId())) {
acc = Bukkit.getOfflinePlayer(UUID.fromString(ep.getAccountId()));
} else {
acc = Bukkit.getOfflinePlayer(ep.getAccountId());
}
String You = ep.describeTo(ep, true); String You = ep.describeTo(ep, true);
if (delta == 0) { if (delta == 0) {
@ -340,35 +377,49 @@ public class Econ {
// -------------------------------------------- // // -------------------------------------------- //
public static boolean hasAccount(String name) { public static boolean hasAccount(String name) {
return econ.hasAccount(name); return econ.hasAccount(Bukkit.getOfflinePlayer(name));
} }
public static double getBalance(String account) { public static double getBalance(String account) {
return econ.getBalance(account); return econ.getBalance(Bukkit.getOfflinePlayer(account));
} }
public static boolean setBalance(String account, double amount) { public static boolean setBalance(String account, double amount) {
double current = econ.getBalance(account); double current = econ.getBalance(Bukkit.getOfflinePlayer(account));
if (current > amount) { if (current > amount) {
return econ.withdrawPlayer(account, current - amount).transactionSuccess(); return econ.withdrawPlayer(Bukkit.getOfflinePlayer(account), current - amount).transactionSuccess();
} else { } else {
return econ.depositPlayer(account, amount - current).transactionSuccess(); return econ.depositPlayer(Bukkit.getOfflinePlayer(account), amount - current).transactionSuccess();
} }
} }
public static boolean modifyBalance(String account, double amount) { public static boolean modifyBalance(String account, double amount) {
if (amount < 0) { if (amount < 0) {
return econ.withdrawPlayer(account, -amount).transactionSuccess(); return econ.withdrawPlayer(Bukkit.getOfflinePlayer(account), -amount).transactionSuccess();
} else { } else {
return econ.depositPlayer(account, amount).transactionSuccess(); return econ.depositPlayer(Bukkit.getOfflinePlayer(account), amount).transactionSuccess();
} }
} }
public static boolean deposit(String account, double amount) { public static boolean deposit(String account, double amount) {
return econ.depositPlayer(account, amount).transactionSuccess(); return econ.depositPlayer(Bukkit.getOfflinePlayer(account), amount).transactionSuccess();
} }
public static boolean withdraw(String account, double amount) { public static boolean withdraw(String account, double amount) {
return econ.withdrawPlayer(account, amount).transactionSuccess(); return econ.withdrawPlayer(Bukkit.getOfflinePlayer(account), amount).transactionSuccess();
} }
// ---------------------------------------
// Helpful Utilities
// ---------------------------------------
public static boolean isUUID(String uuid) {
try {
UUID.fromString(uuid);
} catch(IllegalArgumentException ex) {
return false;
}
return true;
}
} }