Merge branch 'refs/heads/dev' into string-formatting
# Conflicts: # src/main/java/net/knarcraft/bookswithoutborders/command/CommandSave.java
This commit is contained in:
@@ -124,7 +124,7 @@ public class CommandSave implements TabExecutor {
|
|||||||
if (!fileName.contains("Untitled" + config.getTitleAuthorSeparator()) && !overwrite) {
|
if (!fileName.contains("Untitled" + config.getTitleAuthorSeparator()) && !overwrite) {
|
||||||
BooksWithoutBorders.sendErrorMessage(player, "Book is already saved!");
|
BooksWithoutBorders.sendErrorMessage(player, "Book is already saved!");
|
||||||
BooksWithoutBorders.sendErrorMessage(player, "Use " + config.getCommandColor() + (saveToPublicFolder ?
|
BooksWithoutBorders.sendErrorMessage(player, "Use " + config.getCommandColor() + (saveToPublicFolder ?
|
||||||
"/savepublicbook" : "/savebook") + "true " + config.getErrorColor() + "to overwrite!");
|
"/savepublicbook" : "/savebook") + " true " + config.getErrorColor() + "to overwrite!");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -133,7 +133,7 @@ public class CommandSave implements TabExecutor {
|
|||||||
BooksWithoutBorders.sendErrorMessage(player, "Maximum amount of " + fileName +
|
BooksWithoutBorders.sendErrorMessage(player, "Maximum amount of " + fileName +
|
||||||
" duplicates reached!");
|
" duplicates reached!");
|
||||||
BooksWithoutBorders.sendErrorMessage(player, "Use " + config.getCommandColor() + (saveToPublicFolder ?
|
BooksWithoutBorders.sendErrorMessage(player, "Use " + config.getCommandColor() + (saveToPublicFolder ?
|
||||||
"/savepublicbook" : "/savebook") + "true " +
|
"/savepublicbook" : "/savebook") + " true " +
|
||||||
config.getErrorColor() + "to overwrite!");
|
config.getErrorColor() + "to overwrite!");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user