Upstream/Multiverse-Core
1
0
Fork 0
mirror of https://github.com/Multiverse/Multiverse-Core.git synced 2025-02-15 20:12:02 +01:00
Code Issues Projects Releases Wiki Activity

Fix wrong context optional check and arg being null

Browse Source
This commit is contained in:
Ben Woo 2023-09-05 00:21:32 +08:00
parent c253dc1322
commit ec0000bc8a
No known key found for this signature in database
GPG Key ID: FB2A3645536E12C8
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandContexts.java
View File

@ -199,7 +199,7 @@ public class MVCommandContexts extends PaperCommandContexts {
context.popFirstArg();
return world;
}
if (!context.isOptional()) {
if (context.isOptional()) {
return null;
}
throw new InvalidCommandArgument("World " + worldName + " is not a loaded multiverse world.");
@ -225,7 +225,7 @@ public class MVCommandContexts extends PaperCommandContexts {
}
String worldStrings = context.getFirstArg();
String[] worldNames = worldStrings.split(",");
String[] worldNames = worldStrings == null ? new String[0] : worldStrings.split(",");
Set<MVWorld> worlds = new HashSet<>(worldNames.length);
for (String worldName : worldNames) {
if ("*".equals(worldName)) {
@ -259,7 +259,7 @@ public class MVCommandContexts extends PaperCommandContexts {
context.popFirstArg();
return worlds.toArray(new MVWorld[0]);
}
if (!context.isOptional()) {
if (context.isOptional()) {
return null;
}
throw new InvalidCommandArgument("World " + worldStrings + " is not a loaded multiverse world.");
@ -303,7 +303,7 @@ public class MVCommandContexts extends PaperCommandContexts {
context.popFirstArg();
return player;
}
if (!context.isOptional()) {
if (context.isOptional()) {
return null;
}
throw new InvalidCommandArgument("Player " + playerIdentifier + " not found.");
@ -348,7 +348,7 @@ public class MVCommandContexts extends PaperCommandContexts {
context.popFirstArg();
return players;
}
if (!context.isOptional()) {
if (context.isOptional()) {
return null;
}
throw new InvalidCommandArgument("Player " + playerIdentifier + " not found.");