Upstream/Multiverse-Core
1
0
Fork 0
mirror of https://github.com/Multiverse/Multiverse-Core.git synced 2024-09-29 23:57:28 +02:00
Code Issues Projects Releases Wiki Activity

Move the enforce access flag to canEnterWorld so other plugins don't have to check it also, Add "mv conf show"

Browse Source
This commit is contained in:
Eric Stokes 2011-10-16 13:38:05 -06:00
parent 25d9231d30
commit e6f81b01d6
4 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/com/onarandombox/MultiverseCore/commands/ConfigCommand.java
View File

@ -23,12 +23,13 @@ public class ConfigCommand extends MultiverseCommand {
super(plugin);
this.setName("Configuration");
this.setCommandUsage("/mv config " + ChatColor.GREEN + "{PROPERTY} {VALUE}");
this.setArgRange(2, 2);
this.setArgRange(1, 2);
this.addKey("mv config");
this.addKey("mvconfig");
this.addKey("mv conf");
this.addKey("mvconf");
this.addCommandExample("All values: " + ConfigProperty.getAllValues());
this.addCommandExample("/mv config show");
this.addCommandExample("/mv config " + ChatColor.GREEN + "debug" + ChatColor.AQUA + " 3");
this.addCommandExample("/mv config " + ChatColor.GREEN + "enforceaccess" + ChatColor.AQUA + " false");
this.addCommandExample("/mv config " + ChatColor.GREEN + "bedrespawn" + ChatColor.AQUA + " true");
@ -38,6 +39,22 @@ public class ConfigCommand extends MultiverseCommand {
@Override
public void runCommand(CommandSender sender, List<String> args) {
if (args.size() <= 1) {
String[] allProps = ConfigProperty.getAllValues().split(" ");
String currentvals = "";
for (String prop : allProps) {
currentvals += ChatColor.GREEN;
currentvals += prop;
currentvals += ChatColor.WHITE;
currentvals += " = ";
currentvals += ChatColor.GOLD;
currentvals += this.plugin.getMVConfiguration().get(prop, "NOT SET");
currentvals += ChatColor.WHITE;
currentvals += ", ";
}
sender.sendMessage(currentvals.substring(0, currentvals.length() - 2));
return;
}
if (args.get(0).equalsIgnoreCase("messagecooldown") || args.get(0).equalsIgnoreCase("teleportcooldown") || args.get(0).equalsIgnoreCase("debug")) {
try {
this.plugin.getMVConfiguration().set(args.get(0).toLowerCase(), Integer.parseInt(args.get(1)));

2
src/main/java/com/onarandombox/MultiverseCore/commands/ListCommand.java
View File

@ -40,7 +40,7 @@ public class ListCommand extends MultiverseCommand {
String output = ChatColor.LIGHT_PURPLE + "Worlds which you can view:\n";
for (MultiverseWorld world : this.plugin.getMVWorldManager().getMVWorlds()) {
if (MultiverseCore.EnforceAccess && p != null && (!this.plugin.getMVPerms().canEnterWorld(p, world))) {
if (p != null && (!this.plugin.getMVPerms().canEnterWorld(p, world))) {
continue;
}

2
src/main/java/com/onarandombox/MultiverseCore/commands/WhoCommand.java
View File

@ -77,7 +77,7 @@ public class WhoCommand extends MultiverseCommand {
continue;
}
if (MultiverseCore.EnforceAccess && p != null && (!this.plugin.getMVPerms().canEnterWorld(p, world))) {
if (p != null && (!this.plugin.getMVPerms().canEnterWorld(p, world))) {
continue;
}
List<Player> players = world.getCBWorld().getPlayers();

4
src/main/java/com/onarandombox/MultiverseCore/utils/MVPermissions.java
View File

@ -78,6 +78,10 @@ public class MVPermissions implements PermissionsInterface {
* @return
*/
public boolean canEnterWorld(Player p, MultiverseWorld w) {
// If we're not enforcing access, anyone can enter.
if (!MultiverseCore.EnforceAccess) {
return true;
}
return this.hasPermission(p, "multiverse.access." + w.getName(), false);
}