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

Read current exp, instead of stored exp.

Browse Source 
This means that exp used in enchanting is subtracted from total exp.
This commit is contained in:
KHobbits
2011-12-14 03:41:24 +00:00
parent 9d984faefe
commit f251cd14ba
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Essentials/src/com/earth2me/essentials/Trade.java
View File

@@ -81,7 +81,7 @@ public class Trade
} }
if (exp != null && exp > 0 if (exp != null && exp > 0
&& user.getTotalExperience() < exp) { && SetExpFix.getTotalExperience(user) < exp) {
throw new ChargeException(_("notEnoughExperience")); throw new ChargeException(_("notEnoughExperience"));
} }
} }
@@ -116,7 +116,7 @@ public class Trade
} }
if (getExperience() != null) if (getExperience() != null)
{ {
SetExpFix.setTotalExperience(user, user.getTotalExperience() + getExperience()); SetExpFix.setTotalExperience(user, SetExpFix.getTotalExperience(user) + getExperience());
} }
return success; return success;
} }
@@ -155,7 +155,7 @@ public class Trade
} }
if (getExperience() != null) if (getExperience() != null)
{ {
final int experience = user.getTotalExperience(); final int experience = SetExpFix.getTotalExperience(user);
if (experience < getExperience() && getExperience() > 0) if (experience < getExperience() && getExperience() > 0)
{ {
throw new ChargeException(_("notEnoughExperience")); throw new ChargeException(_("notEnoughExperience"));

23
Essentials/src/com/earth2me/essentials/craftbukkit/SetExpFix.java
View File

@@ -17,7 +17,7 @@ public class SetExpFix
int amount = exp; int amount = exp;
while (amount > 0) while (amount > 0)
{ {
final int expToLevel = getExpTolevel(player); final int expToLevel = getExpToLevel(player);
amount -= expToLevel; amount -= expToLevel;
if (amount >= 0) if (amount >= 0)
{ {
@@ -34,8 +34,25 @@ public class SetExpFix
} }
} }
private static int getExpTolevel(final Player player) private static int getExpToLevel(final Player player)
{
return getExpToLevel(player.getLevel());
}
private static int getExpToLevel(final int level)
{
return 7 + (level * 7 >> 1);
}
public static int getTotalExperience(final Player player)
{ {
return 7 + (player.getLevel() * 7 >> 1); int exp = (int) (getExpToLevel(player) * player.getExp());
int currentLevel = player.getLevel();
while (currentLevel > 0) {
currentLevel--;
exp += getExpToLevel(currentLevel);
}
return exp;
} }
} }