Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2025-01-02 14:37:46 +01:00
Code Issues Projects Releases Wiki Activity

Touch of cleanup to Gunfighter's addition to exp

Browse Source
This commit is contained in:
Chris Ward 2013-01-19 18:22:22 +11:00
parent f8ce80c18a
commit 82f9505a2e
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Essentials/src/com/earth2me/essentials/commands/Commandexp.java
View File

@ -26,10 +26,12 @@ public class Commandexp extends EssentialsCommand
} }
else if (Util.isInt(args[0].toLowerCase().replace("l", ""))) // check vanilla syntax else if (Util.isInt(args[0].toLowerCase().replace("l", ""))) // check vanilla syntax
{ {
int lvl = Integer.parseInt(args[0].toLowerCase().replace("l", "")); final String lowerArgs0 = args[0].toLowerCase();
final int lvl = Integer.parseInt(lowerArgs0.replace("l", ""));
final boolean containsL = lowerArgs0.contains("l");
if (args.length > 1 && user.isAuthorized("essentials.exp.give.others")) if (args.length > 1 && user.isAuthorized("essentials.exp.give.others"))
{ {
if (args[0].toLowerCase(Locale.ENGLISH).contains("l")) if (containsL)
{ {
addLevel(server, user, lvl, args[1]); addLevel(server, user, lvl, args[1]);
} }
@ -40,7 +42,7 @@ public class Commandexp extends EssentialsCommand
} }
else else
{ {
if (args[0].toLowerCase(Locale.ENGLISH).contains("l")) if (containsL)
{ {
addLevel(server, user, lvl, user.getName()); addLevel(server, user, lvl, user.getName());
} }
@ -94,10 +96,10 @@ public class Commandexp extends EssentialsCommand
@Override @Override
public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
{ {
String parseLevel = args[0].toLowerCase().replace("l", ""); final String parseLevel = args[0].toLowerCase().replace("l", "");
int lvl = Integer.parseInt(parseLevel);
if (Util.isInt(parseLevel)) if (Util.isInt(parseLevel))
{ {
final int lvl = Integer.parseInt(parseLevel);
if (args[0].toLowerCase(Locale.ENGLISH).contains("l")) if (args[0].toLowerCase(Locale.ENGLISH).contains("l"))
{ {
addLevel(server, sender, lvl, args[1]); addLevel(server, sender, lvl, args[1]);
@ -191,15 +193,14 @@ public class Commandexp extends EssentialsCommand
private void showExp(final CommandSender sender, final User target) private void showExp(final CommandSender sender, final User target)
{ {
final int totalExp = SetExpFix.getTotalExperience(target);
sender.sendMessage(_("exp", target.getDisplayName(), SetExpFix.getTotalExperience(target), target.getLevel(), SetExpFix.getExpUntilNextLevel(target))); sender.sendMessage(_("exp", target.getDisplayName(), SetExpFix.getTotalExperience(target), target.getLevel(), SetExpFix.getExpUntilNextLevel(target)));
} }
private void setExp(final CommandSender sender, final User target, String strAmount, final boolean give) throws NotEnoughArgumentsException private void setExp(final CommandSender sender, final User target, String strAmount, final boolean give) throws NotEnoughArgumentsException
{ {
Long amount; long amount;
strAmount = strAmount.toLowerCase(Locale.ENGLISH); strAmount = strAmount.toLowerCase(Locale.ENGLISH);
if (strAmount.startsWith("l") || strAmount.endsWith("l")) if (strAmount.contains("l"))
{ {
strAmount = strAmount.replaceAll("l", ""); strAmount = strAmount.replaceAll("l", "");
int neededLevel = Integer.parseInt(strAmount); int neededLevel = Integer.parseInt(strAmount);
@ -227,7 +228,7 @@ public class Commandexp extends EssentialsCommand
{ {
amount = (long)Integer.MAX_VALUE; amount = (long)Integer.MAX_VALUE;
} }
SetExpFix.setTotalExperience(target, amount.intValue()); SetExpFix.setTotalExperience(target, (int)amount);
sender.sendMessage(_("expSet", target.getDisplayName(), amount)); sender.sendMessage(_("expSet", target.getDisplayName(), amount));
} }
} }