From 2efb97013f1b8f2bc16aa392a17bfd17d6520933 Mon Sep 17 00:00:00 2001 From: ementalo Date: Fri, 6 May 2011 21:08:58 +0000 Subject: [PATCH] [trunk] cleanup double $ git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1356 e251c2fe-e539-e718-e476-b85c1f46cddb --- .../src/com/earth2me/essentials/commands/Commandsell.java | 2 +- .../src/com/earth2me/essentials/commands/Commandwhois.java | 3 ++- .../src/com/earth2me/essentials/commands/Commandworth.java | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsell.java b/Essentials/src/com/earth2me/essentials/commands/Commandsell.java index 611cceb67..ec51eab33 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandsell.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandsell.java @@ -127,6 +127,6 @@ public class Commandsell extends EssentialsCommand InventoryWorkaround.removeItem(user.getInventory(), true, new ItemStack(is.getType(), amount, is.getDurability())); user.updateInventory(); user.giveMoney(worth * amount); - user.sendMessage("§7Sold for §c$" + Util.formatCurrency(worth * amount) + "§7 (" + amount + " items at $" + Util.formatCurrency(worth) + " each)"); + user.sendMessage("§7Sold for §c" + Util.formatCurrency(worth * amount) + "§7 (" + amount + " items at " + Util.formatCurrency(worth) + " each)"); } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java b/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java index 41698f5f6..5a1b64575 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java @@ -4,6 +4,7 @@ import org.bukkit.Server; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import com.earth2me.essentials.User; +import com.earth2me.essentials.Util; import org.bukkit.ChatColor; @@ -41,7 +42,7 @@ public class Commandwhois extends EssentialsCommand sender.sendMessage(ChatColor.BLUE + " - Location: (" + u.getLocation().getWorld().getName() + ", " + u.getLocation().getBlockX() + ", " + u.getLocation().getBlockY() + ", " + u.getLocation().getBlockZ() + ")"); if (!ess.getConfiguration().getBoolean("disable-eco", false)) { - sender.sendMessage(ChatColor.BLUE + " - Money: $" + u.getMoney()); + sender.sendMessage(ChatColor.BLUE + " - Money: " + Util.formatCurrency(u.getMoney())); } sender.sendMessage(ChatColor.BLUE + " - Status: " + (u.isAfk() ? "§cAway§f" : "Available")); sender.sendMessage(ChatColor.BLUE + " - IP Address: " + u.getAddress().getAddress().toString()); diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandworth.java b/Essentials/src/com/earth2me/essentials/commands/Commandworth.java index 171a97420..1b53d13d9 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandworth.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandworth.java @@ -49,7 +49,7 @@ public class Commandworth extends EssentialsCommand user.charge(this); user.sendMessage("§7Stack of " + is.getType().toString().toLowerCase().replace("_", "") - + " worth §c$" + Util.formatCurrency(worth*amount) + "§7 (" - + amount + " item(s) at $" + Util.formatCurrency(worth) + " each)"); + + " worth §c" + Util.formatCurrency(worth*amount) + "§7 (" + + amount + " item(s) at " + Util.formatCurrency(worth) + " each)"); } }