TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-19 06:58:17 +00:00
Code Issues Projects Releases Wiki Activity

More fixes for the trade signs

Browse source 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1489 e251c2fe-e539-e718-e476-b85c1f46cddb
This commit is contained in:
snowleo 2011-05-15 15:49:53 +00:00
parent fb818a611d
commit 3b94411958
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Essentials/src/com/earth2me/essentials/EssentialsEcoBlockListener.java
View file

@ -119,7 +119,7 @@ public class EssentialsEcoBlockListener extends BlockListener
} }
catch (Throwable ex) catch (Throwable ex)
{ {
user.sendMessage("§cError: " + ex.getMessage()); user.sendMessage(Util.format("errorWithMessage", ex.getMessage()));
event.setLine(0, "§4[Buy]"); event.setLine(0, "§4[Buy]");
event.setLine(1, "#"); event.setLine(1, "#");
event.setLine(2, "Item"); event.setLine(2, "Item");
@ -144,7 +144,7 @@ public class EssentialsEcoBlockListener extends BlockListener
} }
catch (Throwable ex) catch (Throwable ex)
{ {
user.sendMessage("§cError: " + ex.getMessage()); user.sendMessage(Util.format("errorWithMessage", ex.getMessage()));
event.setLine(0, "§4[Sell]"); event.setLine(0, "§4[Sell]");
event.setLine(1, "#"); event.setLine(1, "#");
event.setLine(2, "Item"); event.setLine(2, "Item");
@ -188,7 +188,7 @@ public class EssentialsEcoBlockListener extends BlockListener
ItemStack i2 = ItemDb.get(l2[1], (int)r2); ItemStack i2 = ItemDb.get(l2[1], (int)r2);
if (!InventoryWorkaround.containsItem(user.getInventory(), true, i2)) 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); InventoryWorkaround.removeItem(user.getInventory(), true, i2);
user.updateInventory(); user.updateInventory();
@ -196,12 +196,12 @@ public class EssentialsEcoBlockListener extends BlockListener
event.setLine(0, "§1[Trade]"); event.setLine(0, "§1[Trade]");
event.setLine(1, (m1 ? Util.formatCurrency(q1) : (int)q1 + " " + l1[1]) + ":0"); 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); event.setLine(3, "§8" + username);
} }
catch (Throwable ex) catch (Throwable ex)
{ {
user.sendMessage("§cError: " + ex.getMessage()); user.sendMessage(Util.format("errorWithMessage", ex.getMessage()));
event.setLine(0, "§4[Trade]"); event.setLine(0, "§4[Trade]");
event.setLine(1, "# ItemOr" + ess.getSettings().getCurrencySymbol()); event.setLine(1, "# ItemOr" + ess.getSettings().getCurrencySymbol());
event.setLine(2, "# ItemOr" + ess.getSettings().getCurrencySymbol() + ":#"); event.setLine(2, "# ItemOr" + ess.getSettings().getCurrencySymbol() + ":#");

4
Essentials/src/com/earth2me/essentials/EssentialsEcoPlayerListener.java
View file

@ -180,8 +180,8 @@ public class EssentialsEcoPlayerListener extends PlayerListener
sign.setLine(0, "§1[Trade]"); sign.setLine(0, "§1[Trade]");
sign.setLine(1, (m1 ? Util.formatCurrency(q1) : ((int)q1) + " " + l1[1]) + ":" + (m1 ? Util.roundDouble(r1) : (int)r1)); 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(2, (m2 ? Util.formatCurrency(q2) : ((int)q2) + " " + l2[1]) + ":" + (m2 ? Util.roundDouble(r2) : "" + (int)r2));
sign.update(); sign.update();
user.sendMessage(Util.i18n("tradeCompleted")); user.sendMessage(Util.i18n("tradeCompleted"));
} }