summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2011-12-13 04:52:09 +0000
committerKHobbits <rob@khobbits.co.uk>2011-12-13 04:52:09 +0000
commitc70bff04b7fc4c0d29ecf28e88cd6edaec6ea791 (patch)
tree0ad62851fb6ade5bea3e2c2b0a8d6627631b0c13
parent1f7d722f35344aaa32111d03e4e1201d1a7cec85 (diff)
downloadEssentials-c70bff04b7fc4c0d29ecf28e88cd6edaec6ea791.tar
Essentials-c70bff04b7fc4c0d29ecf28e88cd6edaec6ea791.tar.gz
Essentials-c70bff04b7fc4c0d29ecf28e88cd6edaec6ea791.tar.lz
Essentials-c70bff04b7fc4c0d29ecf28e88cd6edaec6ea791.tar.xz
Essentials-c70bff04b7fc4c0d29ecf28e88cd6edaec6ea791.zip
Update exp trade signs on purchase.
-rw-r--r--Essentials/src/com/earth2me/essentials/User.java5
-rw-r--r--Essentials/src/com/earth2me/essentials/signs/SignTrade.java14
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())
{