EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-28 11:44:42 +02:00
Code Issues Projects Releases Wiki Activity

Cleaner way to handle per-world teleport permissions. Also provides a

Browse Source 
nice error message now to explain WHY a player can't teleport.
This commit is contained in:
GJ
2013-02-20 11:43:23 -05:00
parent 1d87de0a3e
commit 918d81198f
4 changed files with 32 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/com/gmail/nossr50/util/Permissions.java
View File

@ -1,15 +1,14 @@
package com.gmail.nossr50.util;
import java.util.HashMap;
import java.util.Map;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.command.CommandSender;
import org.bukkit.Server;
import org.bukkit.World;
import org.bukkit.permissions.Permissible;
import org.bukkit.permissions.Permission;
import org.bukkit.permissions.PermissionDefault;
import org.bukkit.plugin.PluginManager;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.party.commands.PartySubcommandType;
import com.gmail.nossr50.skills.utilities.SkillType;
@ -216,20 +215,23 @@ public final class Permissions {
public static boolean partyTeleportAcceptAll(Permissible permissible) { return permissible.hasPermission("mcmmo.commands.ptp.acceptall"); }
public static boolean partyTeleportToggle(Permissible permissible) { return permissible.hasPermission("mcmmo.commands.ptp.toggle"); }
// TODO: Still think there's a better way to handle this
public static boolean hasDynamicPermission(CommandSender sender, String perm, String defaultType) {
Map<String, Object> m = new HashMap<String, Object>();
public static boolean partyTeleportAllWorlds(Permissible permissible) { return permissible.hasPermission("mcmmo.commands.ptp.world.all"); }
public static boolean partyTeleportWorld(Permissible permissible, World world) { return permissible.hasPermission("mcmmo.commands.ptp.world." + world.getName()); }
if(defaultType != null) {
m.put("default", defaultType);
public static void generateWorldTeleportPermissions() {
Server server = mcMMO.p.getServer();
PluginManager pluginManager = server.getPluginManager();
for (World world : server.getWorlds()) {
addDynamicPermission("mcmmo.commands.ptp.world." + world.getName(), PermissionDefault.OP, pluginManager);
}
PluginManager manager = Bukkit.getPluginManager();
addDynamicPermission("mcmmo.commands.ptp.world.all", PermissionDefault.OP, pluginManager);
}
if (manager.getPermission(perm) == null) {
Permission.loadPermission(perm, m);
}
return sender.hasPermission(perm);
private static void addDynamicPermission(String permissionName, PermissionDefault permissionDefault, PluginManager pluginManager) {
Permission permission = new Permission(permissionName);
permission.setDefault(permissionDefault);
pluginManager.addPermission(permission);
}
}