diff options
| author | ementalo <ementalo@e251c2fe-e539-e718-e476-b85c1f46cddb> | 2011-05-07 10:58:00 +0000 |
|---|---|---|
| committer | ementalo <ementalo@e251c2fe-e539-e718-e476-b85c1f46cddb> | 2011-05-07 10:58:00 +0000 |
| commit | 0f2b3521b4187e29c72d7a316f21341a7788463d (patch) | |
| tree | 8f6af6d8de997c9eb9ae5e58431f035f8b9aaea2 | |
| parent | 35d03143e0986b1b7c4430083b4ce0b16e3b875d (diff) | |
| download | Essentials-0f2b3521b4187e29c72d7a316f21341a7788463d.tar Essentials-0f2b3521b4187e29c72d7a316f21341a7788463d.tar.gz Essentials-0f2b3521b4187e29c72d7a316f21341a7788463d.tar.lz Essentials-0f2b3521b4187e29c72d7a316f21341a7788463d.tar.xz Essentials-0f2b3521b4187e29c72d7a316f21341a7788463d.zip | |
[trunk]various trade sign fixes
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1359 e251c2fe-e539-e718-e476-b85c1f46cddb
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/EssentialsEcoBlockListener.java | 4 | ||||
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/EssentialsEcoPlayerListener.java | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsEcoBlockListener.java b/Essentials/src/com/earth2me/essentials/EssentialsEcoBlockListener.java index 1fa0440a4..6b70a1a84 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsEcoBlockListener.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsEcoBlockListener.java @@ -165,7 +165,7 @@ public class EssentialsEcoBlockListener extends BlockListener double q2 = Double.parseDouble(m2 ? l2[0].substring(1) : l2[0]); double r2 = Double.parseDouble(l2[m2 ? 1 : 2]); r2 = r2 - r2 % q2; - if (q1 < 1 || q2 < 1 || r2 < 1) + if ((!m1 & q1 < 1) || (!m2 &q2 < 1) || r2 < 1) { throw new Exception("Quantities must be greater than 0."); } @@ -195,7 +195,7 @@ public class EssentialsEcoBlockListener extends BlockListener } event.setLine(0, "§1[Trade]"); - event.setLine(1, (m1 ? "$" + q1 : q1 + " " + l1[1]) + ":0"); + event.setLine(1, (m1 ? "$" + q1 : String.format("%.0f",q1) + " " + l1[1]) + ":0"); event.setLine(2, (m2 ? "$" + q2 : String.format("%.0f", q2)+ " " + l2[1]) + ":" + String.format("%.0f",r2)); event.setLine(3, "§8" + username); } diff --git a/Essentials/src/com/earth2me/essentials/EssentialsEcoPlayerListener.java b/Essentials/src/com/earth2me/essentials/EssentialsEcoPlayerListener.java index f7eb4011d..dfb08cf62 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsEcoPlayerListener.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsEcoPlayerListener.java @@ -100,7 +100,7 @@ public class EssentialsEcoPlayerListener extends PlayerListener double r2 = Double.parseDouble(l2[m2 ? 1 : 2]); r1 = r1 - r1 % q1; r2 = r2 - r2 % q2; - if (q1 < 1 || q2 < 1) + if ((!m1 & q1 < 1) || (!m2 & q2 < 1)) { throw new Exception("Quantities must be greater than 0."); } @@ -109,7 +109,7 @@ public class EssentialsEcoPlayerListener extends PlayerListener ItemStack qi1 = m1 ? null : ItemDb.get(l1[1], (int) q1); ItemStack qi2 = m2 ? null : ItemDb.get(l2[1], (int) q2); - if (username.equals(sign.getLines()[3].substring(2))) + if (!username.equals(sign.getLines()[3].substring(2))) { if (m1) { @@ -177,8 +177,8 @@ public class EssentialsEcoPlayerListener extends PlayerListener r2 -= q2; sign.setLine(0, "§1[Trade]"); - sign.setLine(1, (m1 ? Util.formatCurrency(q1) : (int)q1 + " " + l1[1]) + ":" + r1); - sign.setLine(2, (m2 ? Util.formatCurrency(q2) : (int)q2 + " " + l2[1]) + ":" + r2); + sign.setLine(1, (m1 ? Util.formatCurrency(q1) : String.format("%.0f",q1) + " " + l1[1]) + ":" + String.format("%.0f",r1)); + sign.setLine(2, (m2 ? Util.formatCurrency(q2) : String.format("%.0f",q2) + " " + l2[1]) + ":" + String.format("%.0f",r2)); user.sendMessage("§7Trade completed."); } |