diff options
| author | snowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb> | 2011-05-15 15:49:53 +0000 |
|---|---|---|
| committer | snowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb> | 2011-05-15 15:49:53 +0000 |
| commit | 3b94411958393a108e6811612b091a551cc4abb4 (patch) | |
| tree | c70e5ca707e535f2f57b7297645f57a98fd4c012 | |
| parent | fb818a611da658f95b45607a81986d247070ff4c (diff) | |
| download | Essentials-3b94411958393a108e6811612b091a551cc4abb4.tar Essentials-3b94411958393a108e6811612b091a551cc4abb4.tar.gz Essentials-3b94411958393a108e6811612b091a551cc4abb4.tar.lz Essentials-3b94411958393a108e6811612b091a551cc4abb4.tar.xz Essentials-3b94411958393a108e6811612b091a551cc4abb4.zip | |
More fixes for the trade signs
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1489 e251c2fe-e539-e718-e476-b85c1f46cddb
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/EssentialsEcoBlockListener.java | 10 | ||||
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/EssentialsEcoPlayerListener.java | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsEcoBlockListener.java b/Essentials/src/com/earth2me/essentials/EssentialsEcoBlockListener.java index 874e2a5f0..8317557bb 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsEcoBlockListener.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsEcoBlockListener.java @@ -119,7 +119,7 @@ public class EssentialsEcoBlockListener extends BlockListener } catch (Throwable ex) { - user.sendMessage("§cError: " + ex.getMessage()); + user.sendMessage(Util.format("errorWithMessage", ex.getMessage())); event.setLine(0, "§4[Buy]"); event.setLine(1, "#"); event.setLine(2, "Item"); @@ -144,7 +144,7 @@ public class EssentialsEcoBlockListener extends BlockListener } catch (Throwable ex) { - user.sendMessage("§cError: " + ex.getMessage()); + user.sendMessage(Util.format("errorWithMessage", ex.getMessage())); event.setLine(0, "§4[Sell]"); event.setLine(1, "#"); event.setLine(2, "Item"); @@ -188,7 +188,7 @@ public class EssentialsEcoBlockListener extends BlockListener ItemStack i2 = ItemDb.get(l2[1], (int)r2); if (!InventoryWorkaround.containsItem(user.getInventory(), true, i2)) { - throw new Exception(Util.format("missingItems", r2, l2[1])); + throw new Exception(Util.format("missingItems", (int)r2, l2[1])); } InventoryWorkaround.removeItem(user.getInventory(), true, i2); user.updateInventory(); @@ -196,12 +196,12 @@ public class EssentialsEcoBlockListener extends BlockListener event.setLine(0, "§1[Trade]"); event.setLine(1, (m1 ? Util.formatCurrency(q1) : (int)q1 + " " + l1[1]) + ":0"); - event.setLine(2, (m2 ? Util.formatCurrency(q2) : (int)q2 + " " + l2[1]) + ":" + (m2 ? Util.roundDouble(r2) : (int)r2)); + event.setLine(2, (m2 ? Util.formatCurrency(q2) : (int)q2 + " " + l2[1]) + ":" + (m2 ? Util.roundDouble(r2) : "" + (int)r2)); event.setLine(3, "§8" + username); } catch (Throwable ex) { - user.sendMessage("§cError: " + ex.getMessage()); + user.sendMessage(Util.format("errorWithMessage", ex.getMessage())); event.setLine(0, "§4[Trade]"); event.setLine(1, "# ItemOr" + ess.getSettings().getCurrencySymbol()); event.setLine(2, "# ItemOr" + ess.getSettings().getCurrencySymbol() + ":#"); diff --git a/Essentials/src/com/earth2me/essentials/EssentialsEcoPlayerListener.java b/Essentials/src/com/earth2me/essentials/EssentialsEcoPlayerListener.java index d420c29c5..0a0f82207 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsEcoPlayerListener.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsEcoPlayerListener.java @@ -180,8 +180,8 @@ public class EssentialsEcoPlayerListener extends PlayerListener sign.setLine(0, "§1[Trade]"); - sign.setLine(1, (m1 ? Util.formatCurrency(q1) : ((int)q1) + " " + l1[1]) + ":" + (m1 ? Util.roundDouble(r1) : (int)r1)); - sign.setLine(2, (m2 ? Util.formatCurrency(q2) : ((int)q2) + " " + l2[1]) + ":" + (m2 ? Util.roundDouble(r2) : (int)r2)); + sign.setLine(1, (m1 ? Util.formatCurrency(q1) : ((int)q1) + " " + l1[1]) + ":" + (m1 ? Util.roundDouble(r1) : "" + (int)r1)); + sign.setLine(2, (m2 ? Util.formatCurrency(q2) : ((int)q2) + " " + l2[1]) + ":" + (m2 ? Util.roundDouble(r2) : "" + (int)r2)); sign.update(); user.sendMessage(Util.i18n("tradeCompleted")); } |