Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-09-13 16:38:06 +02:00
Code Issues Projects Releases Wiki Activity

Fix of the recharge code, also the maximum line length on signs is 15 not 16!

Browse Source
This commit is contained in:
snowleo 2011-10-10 00:27:55 +02:00
parent 6012086fa5
commit a34c92d55a
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Essentials/src/com/earth2me/essentials/signs/SignTrade.java
View File

@ -33,18 +33,22 @@ public class SignTrade extends EssentialsSign
{ {
if (sign.getLine(3).substring(2).equalsIgnoreCase(username)) if (sign.getLine(3).substring(2).equalsIgnoreCase(username))
{ {
final Trade store = rechargeSign(sign, ess, player);
Trade stored = null;
try try
{ {
final Trade store = rechargeSign(sign, ess, player); stored = getTrade(sign, 1, true, true, ess);
final Trade stored = getTrade(sign, 1, true, true, ess);
substractAmount(sign, 1, stored, ess); substractAmount(sign, 1, stored, ess);
stored.pay(player); stored.pay(player);
Trade.log("Sign", "Trade", "OwnerInteract", username, store, username, stored, sign.getBlock().getLocation(), ess);
} }
catch (SignException e) catch (SignException e)
{ {
throw new SignException(Util.i18n("tradeSignEmptyOwner"), e); if (store == null)
{
throw new SignException(Util.i18n("tradeSignEmptyOwner"), e);
}
} }
Trade.log("Sign", "Trade", "OwnerInteract", username, store, username, stored, sign.getBlock().getLocation(), ess);
} }
else else
{ {
@ -162,7 +166,7 @@ public class SignTrade extends EssentialsSign
throw new SignException(Util.i18n("moreThanZero")); throw new SignException(Util.i18n("moreThanZero"));
} }
String newline = amount + " " + split[1] + ":0"; String newline = amount + " " + split[1] + ":0";
if ((newline + amount).length() > 16) if ((newline + amount).length() > 15)
{ {
throw new SignException("Line can be too long!"); throw new SignException("Line can be too long!");
} }
@ -272,7 +276,7 @@ public class SignTrade extends EssentialsSign
if (money != null && amount != null) if (money != null && amount != null)
{ {
final String newline = Util.formatCurrency(money, ess) + ":" + Util.formatCurrency(amount + value, ess).substring(1); final String newline = Util.formatCurrency(money, ess) + ":" + Util.formatCurrency(amount + value, ess).substring(1);
if (newline.length() > 16) if (newline.length() > 15)
{ {
throw new SignException("Line too long!"); throw new SignException("Line too long!");
} }
@ -287,7 +291,7 @@ public class SignTrade extends EssentialsSign
final ItemStack item = getItemStack(split[1], stackamount, ess); final ItemStack item = getItemStack(split[1], stackamount, ess);
final int amount = getInteger(split[2]); final int amount = getInteger(split[2]);
final String newline = stackamount + " " + split[1] + ":" + (amount + Math.round(value)); final String newline = stackamount + " " + split[1] + ":" + (amount + Math.round(value));
if (newline.length() > 16) if (newline.length() > 15)
{ {
throw new SignException("Line too long!"); throw new SignException("Line too long!");
} }