From 050b2cae18ac388bcfd4120705993e93460d2c6a Mon Sep 17 00:00:00 2001 From: ementalo Date: Sat, 7 May 2011 11:13:26 +0000 Subject: [PATCH] [trunk] more trade sign fixes, upon breaking git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1361 e251c2fe-e539-e718-e476-b85c1f46cddb --- .../com/earth2me/essentials/EssentialsEcoBlockListener.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/EssentialsEcoBlockListener.java b/Essentials/src/com/earth2me/essentials/EssentialsEcoBlockListener.java index 6b70a1a84..ee2c1a96e 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsEcoBlockListener.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsEcoBlockListener.java @@ -53,11 +53,11 @@ public class EssentialsEcoBlockListener extends BlockListener String[] l2 = sign.getLines()[2].split("[ :-]+"); boolean m1 = l1[0].matches("\\$[0-9]+(\\.[0-9]+)?"); boolean m2 = l2[0].matches("\\$[0-9]+(\\.[0-9]+)?"); - int q1 = Integer.parseInt(m1 ? l1[0].substring(1) : l1[0]); - int q2 = Integer.parseInt(m2 ? l2[0].substring(1) : l2[0]); + double q1 = Double.parseDouble(m1 ? l1[0].substring(1) : l1[0]); + double q2 = Double.parseDouble(m2 ? l2[0].substring(1) : l2[0]); double r1 = Double.parseDouble(l1[m1 ? 1 : 2]); double r2 = Double.parseDouble(l2[m2 ? 1 : 2]); - if (q1 < 1 || q2 < 1) + if ((!m1 & q1 < 1) || (!m2 & q2 < 1)) { throw new Exception("Quantities must be greater than 0."); }