minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-15 11:04:29 +02:00
Code Issues Releases Wiki Activity

[trunk]various trade sign fixes

Browse Source 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1359 e251c2fe-e539-e718-e476-b85c1f46cddb
This commit is contained in:
ementalo
2011-05-07 10:58:00 +00:00
parent 82a1e7460a
commit f4d0f5b672
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Essentials/src/com/earth2me/essentials/EssentialsEcoBlockListener.java
View File

@@ -165,7 +165,7 @@ public class EssentialsEcoBlockListener extends BlockListener
double q2 = Double.parseDouble(m2 ? l2[0].substring(1) : l2[0]); double q2 = Double.parseDouble(m2 ? l2[0].substring(1) : l2[0]);
double r2 = Double.parseDouble(l2[m2 ? 1 : 2]); double r2 = Double.parseDouble(l2[m2 ? 1 : 2]);
r2 = r2 - r2 % q2; 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."); 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(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(2, (m2 ? "$" + q2 : String.format("%.0f", q2)+ " " + l2[1]) + ":" + String.format("%.0f",r2));
event.setLine(3, "§8" + username); event.setLine(3, "§8" + username);
} }

8
Essentials/src/com/earth2me/essentials/EssentialsEcoPlayerListener.java
View File

@@ -100,7 +100,7 @@ public class EssentialsEcoPlayerListener extends PlayerListener
double r2 = Double.parseDouble(l2[m2 ? 1 : 2]); double r2 = Double.parseDouble(l2[m2 ? 1 : 2]);
r1 = r1 - r1 % q1; r1 = r1 - r1 % q1;
r2 = r2 - r2 % q2; 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."); 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 qi1 = m1 ? null : ItemDb.get(l1[1], (int) q1);
ItemStack qi2 = m2 ? null : ItemDb.get(l2[1], (int) q2); 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) if (m1)
{ {
@@ -177,8 +177,8 @@ public class EssentialsEcoPlayerListener extends PlayerListener
r2 -= q2; r2 -= q2;
sign.setLine(0, "§1[Trade]"); sign.setLine(0, "§1[Trade]");
sign.setLine(1, (m1 ? Util.formatCurrency(q1) : (int)q1 + " " + l1[1]) + ":" + r1); sign.setLine(1, (m1 ? Util.formatCurrency(q1) : String.format("%.0f",q1) + " " + l1[1]) + ":" + String.format("%.0f",r1));
sign.setLine(2, (m2 ? Util.formatCurrency(q2) : (int)q2 + " " + l2[1]) + ":" + r2); sign.setLine(2, (m2 ? Util.formatCurrency(q2) : String.format("%.0f",q2) + " " + l2[1]) + ":" + String.format("%.0f",r2));
user.sendMessage("§7Trade completed."); user.sendMessage("§7Trade completed.");
} }