Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-07-05 11:14:49 +02:00
Code Issues Projects Releases Wiki Activity

Fixed tests

Browse Source 
They were broken as of 8a16940e14
This commit is contained in:
Florian CUNY 2018-12-15 10:30:17 +01:00
parent b6e8c19a86
commit 7dd06b9d9b
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/world/bentobox/bentobox/api/commands/DefaultHelpCommand.java
View File

@ -94,7 +94,7 @@ public class DefaultHelpCommand extends CompositeCommand {
if (user.isPlayer()) {
// Player. Check perms
if (user.isOp() || user.hasPermission(parent.getPermission())) {
if (params.isEmpty()) {
if (params == null || params.isEmpty()) {
user.sendMessage(HELP_SYNTAX_NO_PARAMETERS_REF, USAGE_PLACEHOLDER, usage, DESC_PLACEHOLDER, desc);
} else {
user.sendMessage(HELP_SYNTAX_REF, USAGE_PLACEHOLDER, usage, PARAMS_PLACEHOLDER, params, DESC_PLACEHOLDER, desc);
@ -105,7 +105,7 @@ public class DefaultHelpCommand extends CompositeCommand {
}
} else if (!parent.isOnlyPlayer()) {
// Console. Only show if it is a console command
if (params.isEmpty()) {
if (params == null || params.isEmpty()) {
user.sendMessage(HELP_SYNTAX_NO_PARAMETERS_REF, USAGE_PLACEHOLDER, usage, DESC_PLACEHOLDER, desc);
} else {
user.sendMessage(HELP_SYNTAX_REF, USAGE_PLACEHOLDER, usage, PARAMS_PLACEHOLDER, params, DESC_PLACEHOLDER, desc);

8
src/test/java/world/bentobox/bentobox/api/commands/DefaultHelpCommandTest.java
View File

@ -140,11 +140,9 @@ public class DefaultHelpCommandTest {
Mockito.verify(user).getTranslationOrNothing("parameters");
Mockito.verify(user).getTranslation("description");
Mockito.verify(user).sendMessage(
"commands.help.syntax",
"commands.help.syntax-no-parameters",
"[usage]",
"island",
"[parameters]",
"",
"[description]",
"the main island command"
);
@ -169,11 +167,9 @@ public class DefaultHelpCommandTest {
Mockito.verify(user).getTranslationOrNothing("parameters");
Mockito.verify(user).getTranslation("description");
Mockito.verify(user).sendMessage(
"commands.help.syntax",
"commands.help.syntax-no-parameters",
"[usage]",
"island",
"[parameters]",
"",
"[description]",
"the main island command"
);