diff options
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/User.java | 5 | ||||
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/signs/SignTrade.java | 14 |
2 files changed, 15 insertions, 4 deletions
diff --git a/Essentials/src/com/earth2me/essentials/User.java b/Essentials/src/com/earth2me/essentials/User.java index 6f389f749..b16570374 100644 --- a/Essentials/src/com/earth2me/essentials/User.java +++ b/Essentials/src/com/earth2me/essentials/User.java @@ -551,14 +551,13 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser } @Override - public void setXP(int l) { + public void setXP(final int exp) { base.setExp(0); base.setLevel(0); base.setTotalExperience(0); - for(int i=0;i<l; ++i) { + for(int i=0;i<exp; ++i) { base.giveExp(1); } - this.sendMessage("new exp: " + base.getExp() + " total exp: " + base.getTotalExperience()); } } diff --git a/Essentials/src/com/earth2me/essentials/signs/SignTrade.java b/Essentials/src/com/earth2me/essentials/signs/SignTrade.java index 9296eb6f4..943a14a83 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignTrade.java +++ b/Essentials/src/com/earth2me/essentials/signs/SignTrade.java @@ -6,7 +6,8 @@ import org.bukkit.inventory.ItemStack; //TODO: Sell Enchantment on Trade signs? public class SignTrade extends EssentialsSign -{ +{ + public SignTrade() { super("Trade"); @@ -267,6 +268,11 @@ public class SignTrade extends EssentialsSign { changeAmount(sign, index, -item.getAmount(), ess); } + final Integer exp = trade.getExperience(); + if (exp != null) + { + changeAmount(sign, index, -exp.intValue(), ess); + } } protected final void addAmount(final ISign sign, final int index, final Trade trade, final IEssentials ess) throws SignException @@ -281,10 +287,16 @@ public class SignTrade extends EssentialsSign { changeAmount(sign, index, item.getAmount(), ess); } + final Integer exp = trade.getExperience(); + if (exp != null) + { + changeAmount(sign, index, exp.intValue(), ess); + } } private void changeAmount(final ISign sign, final int index, final double value, final IEssentials ess) throws SignException { + final String line = sign.getLine(index).trim(); if (line.isEmpty()) { |