Merge remote-tracking branch 'origin/paperstuff' into paperstuff

# Conflicts:
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Help.java
This commit is contained in:
MattBDev 2019-08-05 14:07:09 -04:00
commit f06903f1b8

View File

@ -83,9 +83,10 @@ public class Help extends Command {
.replaceAll(Captions.HELP_INFO_ITEM.s(), "%category%", c.toString().toLowerCase(),
"%category_desc%", c.toString()));
}
builder.append("\n").append(Captions.HELP_INFO_ITEM.s().replaceAll("%category%", "all")
.replaceAll("%category_desc%", Captions.HELP_DISPLAY_ALL_COMMANDS.s()));
builder.append("\n" + Captions.HELP_FOOTER.s());
builder.append("\n")
.append(Captions.HELP_INFO_ITEM.s().replaceAll("%category%", "all")
.replaceAll("%category_desc%", "Display all commands"));
builder.append("\n").append(Captions.HELP_FOOTER.s());
MainUtil.sendMessage(player, builder.toString(), false);
return true;
}