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

feat: Add support for resolving MVWorld based on issuer

Browse Source
This commit is contained in:
Ben Woo 2023-02-13 16:42:15 +08:00
parent 9efbbe7a4b
commit 7978193d88
1 changed files with 39 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,7 @@ public class MVCommandContexts extends PaperCommandContexts {
registerIssuerOnlyContext(BukkitCommandIssuer.class, BukkitCommandExecutionContext::getIssuer); registerIssuerOnlyContext(BukkitCommandIssuer.class, BukkitCommandExecutionContext::getIssuer);
registerOptionalContext(ContentFilter.class, this::parseContentFilter); registerOptionalContext(ContentFilter.class, this::parseContentFilter);
registerContext(MVWorld.class, this::parseMVWorld); registerIssuerAwareContext(MVWorld.class, this::parseMVWorld);
registerContext(ParsedDestination.class, this::parseDestination); registerContext(ParsedDestination.class, this::parseDestination);
registerIssuerAwareContext(Player.class, this::parsePlayer); registerIssuerAwareContext(Player.class, this::parsePlayer);
registerIssuerAwareContext(Player[].class, this::parsePlayerArray); registerIssuerAwareContext(Player[].class, this::parsePlayerArray);
@ -52,12 +52,45 @@ public class MVCommandContexts extends PaperCommandContexts {
} }
private MVWorld parseMVWorld(BukkitCommandExecutionContext context) { private MVWorld parseMVWorld(BukkitCommandExecutionContext context) {
String worldName = context.popFirstArg(); String resolve = context.getFlagValue("resolve", "");
MVWorld world = plugin.getMVWorldManager().getMVWorld(worldName);
if (world == null) { // Get world based on sender only
throw new InvalidCommandArgument("World " + worldName + " is not a multiverse world."); if (resolve.equals("issuerOnly")) {
if (context.getIssuer().isPlayer()) {
return plugin.getMVWorldManager().getMVWorld(context.getIssuer().getPlayer().getWorld());
}
if (context.isOptional()) {
return null;
}
throw new InvalidCommandArgument("This command can only be used by a player in a Multiverse World.");
} }
return world;
String worldName = context.getFirstArg();
MVWorld world = plugin.getMVWorldManager().getMVWorld(worldName);
// Get world based on input, fallback to sender if input is not a world
if (resolve.equals("issuerAware")) {
if (world != null) {
context.popFirstArg();
return world;
}
if (context.getIssuer().isPlayer()) {
return plugin.getMVWorldManager().getMVWorld(context.getIssuer().getPlayer().getWorld());
}
if (context.isOptional()) {
return null;
}
throw new InvalidCommandArgument("Player is not in a Multiverse World.");
}
// Get world based on input only
if (world != null) {
return world;
}
if (!context.isOptional()) {
return null;
}
throw new InvalidCommandArgument("World " + worldName + " is not a loaded multiverse world.");
} }
private Player parsePlayer(BukkitCommandExecutionContext context) { private Player parsePlayer(BukkitCommandExecutionContext context) {