From 561ab2292435f1759ce91d14bd0139a80cd937f5 Mon Sep 17 00:00:00 2001 From: eueln Date: Fri, 9 Jan 2015 11:44:15 -0600 Subject: [PATCH] Remove most mentions of getOfflinePlayer(String) Faction bank accounts will need to be migrated to use UUID identifiers before we can remove the remaining getOfflinePlayer(String) calls. --- .../massivecraft/factions/cmd/FCommand.java | 14 +++++----- .../factions/integration/Econ.java | 26 +++++++++++-------- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/cmd/FCommand.java b/src/main/java/com/massivecraft/factions/cmd/FCommand.java index a3ae7b77..d30b83b1 100644 --- a/src/main/java/com/massivecraft/factions/cmd/FCommand.java +++ b/src/main/java/com/massivecraft/factions/cmd/FCommand.java @@ -5,8 +5,6 @@ import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.struct.Role; import com.massivecraft.factions.zcore.MCommand; import com.massivecraft.factions.zcore.util.TL; -import org.bukkit.Bukkit; -import org.bukkit.OfflinePlayer; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -141,10 +139,11 @@ public abstract class FCommand extends MCommand

{ FPlayer ret = def; if (name != null) { - OfflinePlayer player = Bukkit.getOfflinePlayer(name); - FPlayer fplayer = FPlayers.getInstance().getByOfflinePlayer(player); - if (fplayer != null) { - ret = fplayer; + for (FPlayer fplayer : FPlayers.getInstance().getAllFPlayers()) { + if (fplayer.getName().equalsIgnoreCase(name)) { + ret = fplayer; + break; + } } } @@ -203,8 +202,7 @@ public abstract class FCommand extends MCommand

{ // Next we match player names if (faction == null) { - OfflinePlayer player = Bukkit.getOfflinePlayer(name); - FPlayer fplayer = FPlayers.getInstance().getByOfflinePlayer(player); + FPlayer fplayer = strAsFPlayer(name, null, false); if (fplayer != null) { faction = fplayer.getFaction(); } diff --git a/src/main/java/com/massivecraft/factions/integration/Econ.java b/src/main/java/com/massivecraft/factions/integration/Econ.java index 060dd9a8..71c442d5 100644 --- a/src/main/java/com/massivecraft/factions/integration/Econ.java +++ b/src/main/java/com/massivecraft/factions/integration/Econ.java @@ -251,7 +251,7 @@ public class Econ { if (isUUID(ep.getAccountId())) { currentBalance = econ.getBalance(Bukkit.getOfflinePlayer(UUID.fromString(ep.getAccountId()))); } else { - currentBalance = econ.getBalance(Bukkit.getOfflinePlayer(ep.getAccountId())); + currentBalance = econ.getBalance(ep.getAccountId()); } if (currentBalance >= delta) { @@ -366,11 +366,11 @@ public class Econ { // -------------------------------------------- // public static boolean hasAccount(String name) { - return econ.hasAccount(Bukkit.getOfflinePlayer(name)); + return econ.hasAccount(name); } public static double getBalance(String account) { - return econ.getBalance(Bukkit.getOfflinePlayer(account)); + return econ.getBalance(account); } private static final DecimalFormat format = new DecimalFormat("#,###"); @@ -380,32 +380,36 @@ public class Econ { } public static String getFriendlyBalance(FPlayer player) { - return format.format(econ.getBalance(Bukkit.getOfflinePlayer(player.getName()))); + OfflinePlayer offline = Bukkit.getOfflinePlayer(UUID.fromString(player.getId())); + if (offline.getName() == null) { + return "0"; + } + return format.format(econ.getBalance(offline)); } public static boolean setBalance(String account, double amount) { - double current = econ.getBalance(Bukkit.getOfflinePlayer(account)); + double current = econ.getBalance(account); if (current > amount) { - return econ.withdrawPlayer(Bukkit.getOfflinePlayer(account), current - amount).transactionSuccess(); + return econ.withdrawPlayer(account, current - amount).transactionSuccess(); } else { - return econ.depositPlayer(Bukkit.getOfflinePlayer(account), amount - current).transactionSuccess(); + return econ.depositPlayer(account, amount - current).transactionSuccess(); } } public static boolean modifyBalance(String account, double amount) { if (amount < 0) { - return econ.withdrawPlayer(Bukkit.getOfflinePlayer(account), -amount).transactionSuccess(); + return econ.withdrawPlayer(account, -amount).transactionSuccess(); } else { - return econ.depositPlayer(Bukkit.getOfflinePlayer(account), amount).transactionSuccess(); + return econ.depositPlayer(account, amount).transactionSuccess(); } } public static boolean deposit(String account, double amount) { - return econ.depositPlayer(Bukkit.getOfflinePlayer(account), amount).transactionSuccess(); + return econ.depositPlayer(account, amount).transactionSuccess(); } public static boolean withdraw(String account, double amount) { - return econ.withdrawPlayer(Bukkit.getOfflinePlayer(account), amount).transactionSuccess(); + return econ.withdrawPlayer(account, amount).transactionSuccess(); } // ---------------------------------------