mirror of
https://github.com/TotalFreedomMC/TF-EssentialsX.git
synced 2025-08-03 11:06:08 +00:00
Adds vanilla syntax to /exp command
This commit is contained in:
parent
313fd30ce9
commit
f8ce80c18a
1 changed files with 89 additions and 18 deletions
|
@ -2,6 +2,7 @@ package com.earth2me.essentials.commands;
|
||||||
|
|
||||||
import static com.earth2me.essentials.I18n._;
|
import static com.earth2me.essentials.I18n._;
|
||||||
import com.earth2me.essentials.User;
|
import com.earth2me.essentials.User;
|
||||||
|
import com.earth2me.essentials.Util;
|
||||||
import com.earth2me.essentials.craftbukkit.SetExpFix;
|
import com.earth2me.essentials.craftbukkit.SetExpFix;
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
import org.bukkit.Server;
|
import org.bukkit.Server;
|
||||||
|
@ -23,6 +24,33 @@ public class Commandexp extends EssentialsCommand
|
||||||
{
|
{
|
||||||
showExp(user, user);
|
showExp(user, user);
|
||||||
}
|
}
|
||||||
|
else if (Util.isInt(args[0].toLowerCase().replace("l", ""))) // check vanilla syntax
|
||||||
|
{
|
||||||
|
int lvl = Integer.parseInt(args[0].toLowerCase().replace("l", ""));
|
||||||
|
if (args.length > 1 && user.isAuthorized("essentials.exp.give.others"))
|
||||||
|
{
|
||||||
|
if (args[0].toLowerCase(Locale.ENGLISH).contains("l"))
|
||||||
|
{
|
||||||
|
addLevel(server, user, lvl, args[1]);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
expMatch(server, user, args[1], args[0], true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (args[0].toLowerCase(Locale.ENGLISH).contains("l"))
|
||||||
|
{
|
||||||
|
addLevel(server, user, lvl, user.getName());
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
expMatch(server, user, user.getName(), args[0], true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
else if (args[0].equalsIgnoreCase("set") && user.isAuthorized("essentials.exp.set"))
|
else if (args[0].equalsIgnoreCase("set") && user.isAuthorized("essentials.exp.set"))
|
||||||
{
|
{
|
||||||
if (args.length == 3 && user.isAuthorized("essentials.exp.set.others"))
|
if (args.length == 3 && user.isAuthorized("essentials.exp.set.others"))
|
||||||
|
@ -65,6 +93,22 @@ 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", "");
|
||||||
|
int lvl = Integer.parseInt(parseLevel);
|
||||||
|
if (Util.isInt(parseLevel))
|
||||||
|
{
|
||||||
|
if (args[0].toLowerCase(Locale.ENGLISH).contains("l"))
|
||||||
|
{
|
||||||
|
addLevel(server, sender, lvl, args[1]);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
expMatch(server, sender, args[1], args[0], true);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
else
|
||||||
{
|
{
|
||||||
if (args.length < 1)
|
if (args.length < 1)
|
||||||
{
|
{
|
||||||
|
@ -88,6 +132,7 @@ public class Commandexp extends EssentialsCommand
|
||||||
showMatch(server, sender, match);
|
showMatch(server, sender, match);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void showMatch(final Server server, final CommandSender sender, final String match) throws NotEnoughArgumentsException
|
private void showMatch(final Server server, final CommandSender sender, final String match) throws NotEnoughArgumentsException
|
||||||
{
|
{
|
||||||
|
@ -119,6 +164,31 @@ public class Commandexp extends EssentialsCommand
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void addLevel(final Server server, final CommandSender sender, final int level, final String target) throws NotEnoughArgumentsException
|
||||||
|
{
|
||||||
|
boolean foundUser = false;
|
||||||
|
for (Player matchPlayer : server.matchPlayer(target))
|
||||||
|
{
|
||||||
|
final User user = ess.getUser(matchPlayer);
|
||||||
|
final int curLevel = user.getLevel();
|
||||||
|
final int fLevel = curLevel + level;
|
||||||
|
if (fLevel < 0)
|
||||||
|
{
|
||||||
|
user.setLevel(0);
|
||||||
|
user.setExp(0F);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
user.setLevel(fLevel);
|
||||||
|
}
|
||||||
|
foundUser = true;
|
||||||
|
}
|
||||||
|
if (!foundUser)
|
||||||
|
{
|
||||||
|
throw new NotEnoughArgumentsException(_("playerNotFound"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void showExp(final CommandSender sender, final User target)
|
private void showExp(final CommandSender sender, final User target)
|
||||||
{
|
{
|
||||||
final int totalExp = SetExpFix.getTotalExperience(target);
|
final int totalExp = SetExpFix.getTotalExperience(target);
|
||||||
|
@ -140,7 +210,8 @@ public class Commandexp extends EssentialsCommand
|
||||||
amount = (long)SetExpFix.getExpToLevel(neededLevel);
|
amount = (long)SetExpFix.getExpToLevel(neededLevel);
|
||||||
SetExpFix.setTotalExperience(target, 0);
|
SetExpFix.setTotalExperience(target, 0);
|
||||||
}
|
}
|
||||||
else {
|
else
|
||||||
|
{
|
||||||
amount = Long.parseLong(strAmount);
|
amount = Long.parseLong(strAmount);
|
||||||
if (amount < 0 || amount > Integer.MAX_VALUE)
|
if (amount < 0 || amount > Integer.MAX_VALUE)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue