Upstream/mmoitems
1
0
Fork 0
mirror of https://gitlab.com/phoenix-dvpmt/mmoitems.git synced 2025-02-27 15:31:22 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed -matchlevel

Browse Source
This commit is contained in:
Jules 2023-04-23 13:42:08 +02:00
parent 40e0c9ad21
commit 8073cee347
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MMOItems-API/src/main/java/net/Indyuce/mmoitems/command/mmoitems/GenerateCommandHandler.java
View File

@ -13,7 +13,7 @@ public class GenerateCommandHandler {
public boolean hasArgument(String key) {
for (String argument : arguments)
if (argument.startsWith("-" + key + ":"))
if (argument.startsWith("-" + key))
return true;
return false;
}

12
MMOItems-API/src/main/java/net/Indyuce/mmoitems/command/mmoitems/GenerateCommandTreeNode.java
View File

@ -49,29 +49,29 @@ public class GenerateCommandTreeNode extends CommandTreeNode {
Validate.notNull(give, "You cannot use -gimme");
final RPGPlayer rpgPlayer = PlayerData.get(target).getRPG();
final int itemLevel = handler.hasArgument("level") ? Integer.parseInt(handler.getValue("level"))
final int itemLevel = handler.hasArgument("level:") ? Integer.parseInt(handler.getValue("level"))
: (handler.hasArgument("matchlevel") ? MMOItems.plugin.getTemplates().rollLevel(rpgPlayer.getLevel()) : 1 + random.nextInt(100));
final @Nullable ItemTier itemTier = handler.hasArgument("tierset") ? null : handler.hasArgument("tier")
final @Nullable ItemTier itemTier = handler.hasArgument("tierset") ? null : handler.hasArgument("tier:")
? MMOItems.plugin.getTiers().getOrThrow(handler.getValue("tier").toUpperCase().replace("-", "_"))
: MMOItems.plugin.getTemplates().rollTier();
final TemplateExplorer builder = new TemplateExplorer();
if (handler.hasArgument("matchclass"))
builder.applyFilter(new ClassFilter(rpgPlayer));
if (handler.hasArgument("class"))
if (handler.hasArgument("class:"))
builder.applyFilter(new ClassFilter(handler.getValue("class").replace("-", " ").replace("_", " ")));
String type = null;
if (handler.hasArgument("tierset")) {
if (handler.hasArgument("tierset:")) {
String format = UtilityMethods.enumName(handler.getValue("tierset"));
Validate.isTrue(MMOItems.plugin.getTiers().has(format), "Could not find tier with ID '" + format + "'");
builder.applyFilter(new TierFilter(format));
}
if (handler.hasArgument("type")) {
if (handler.hasArgument("type:")) {
type = handler.getValue("type");
Validate.isTrue(Type.isValid(type), "Could not find type with ID '" + type + "'");
builder.applyFilter(new TypeFilter(Type.get(type)));
}
if (handler.hasArgument("id")) {
if (handler.hasArgument("id:")) {
Validate.isTrue(type != null, "You have to specify a type if using the id option!");
builder.applyFilter(new IDFilter(handler.getValue("id")));
}