EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-25 22:56:45 +01:00
Code Issues Projects Releases Wiki Activity

Merge with breaking

Browse Source
This commit is contained in:
MattBDev 2019-08-03 23:26:16 -04:00
parent bb21abb110
commit 01dfdbe2ef
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugImportWorlds.java
View File

@ -40,7 +40,7 @@ import java.util.concurrent.CompletableFuture;
if (container.equals(new File("."))) { if (container.equals(new File("."))) {
player.sendMessage( player.sendMessage(
"World container must be configured to be a separate directory to your base files!"); "World container must be configured to be a separate directory to your base files!");
return; return CompletableFuture.completedFuture(false);
} }
for (File folder : container.listFiles()) { for (File folder : container.listFiles()) {
String name = folder.getName(); String name = folder.getName();

5
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Help.java
View File

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