Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-06-17 06:03:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moved YAML classes from RegionBook from WorldGuard into WorldEdit and made everything use those.

Browse Source
This commit is contained in:
zml2008
2011-10-22 22:22:50 -07:00
parent a928349b1a
commit 52982c7c0f
13 changed files with 1126 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/com/sk89q/bukkit/migration/NijiPermissionsResolver.java
View File

@ -19,6 +19,7 @@
package com.sk89q.bukkit.migration;
import com.sk89q.util.yaml.YAMLProcessor;
import org.bukkit.Bukkit;
import org.bukkit.Server;
import org.bukkit.command.PluginCommand;
@ -26,13 +27,12 @@ import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.PluginManager;
import com.nijikokun.bukkit.Permissions.Permissions;
import org.bukkit.configuration.Configuration;
public class NijiPermissionsResolver implements PermissionsResolver {
private Server server;
private Permissions api;
public static PermissionsResolver factory(Server server, Configuration config) {
public static PermissionsResolver factory(Server server, YAMLProcessor config) {
PluginManager pluginManager = server.getPluginManager();
Plugin plugin = pluginManager.getPlugin("Permissions");
@ -62,7 +62,7 @@ public class NijiPermissionsResolver implements PermissionsResolver {
@SuppressWarnings("static-access")
public boolean hasPermission(String name, String permission) {
try {
Player player = server.getPlayer(name);
Player player = server.getPlayerExact(name);
if (player == null) return false;
try {
return api.getHandler().has(player, permission);
@ -80,7 +80,7 @@ public class NijiPermissionsResolver implements PermissionsResolver {
try {
return api.getHandler().has(worldName, name, permission);
} catch (Throwable t) {
return api.getHandler().has(server.getPlayer(name), permission);
return api.getHandler().has(server.getPlayerExact(name), permission);
}
} catch (Throwable t) {
t.printStackTrace();
@ -91,7 +91,7 @@ public class NijiPermissionsResolver implements PermissionsResolver {
@SuppressWarnings("static-access")
public boolean inGroup(String name, String group) {
try {
Player player = server.getPlayer(name);
Player player = server.getPlayerExact(name);
if (player == null) return false;
try {
return api.getHandler().inGroup(player.getWorld().getName(), name, group);
@ -107,7 +107,7 @@ public class NijiPermissionsResolver implements PermissionsResolver {
@SuppressWarnings("static-access")
public String[] getGroups(String name) {
try {
Player player = server.getPlayer(name);
Player player = server.getPlayerExact(name);
if (player == null) return new String[0];
String[] groups = null;
try {
@ -127,22 +127,6 @@ public class NijiPermissionsResolver implements PermissionsResolver {
}
}
public static class PluginAccessException extends Exception {
private static final long serialVersionUID = 7044832912491608706L;
}
@Deprecated
public static boolean checkRealNijiPerms(boolean ignoreBridges) {
if (!ignoreBridges) {
return true;
}
PluginCommand permsCommand = Bukkit.getServer().getPluginCommand("permissions");
if (permsCommand == null) {
return false;
}
return permsCommand.getPlugin().getDescription().getName().equals("Permissions");
}
public static boolean isFakeNijiPerms(Plugin plugin) {
PluginCommand permsCommand = Bukkit.getServer().getPluginCommand("permissions");