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

Moved WEPIF to the com.sk89q.wepif package and made PermissionsResolverManager a singleton

Browse Source 
Added OfflinePlayer permissions fetching methods to WEPIF
This commit is contained in:
zml2008
2011-12-04 09:56:35 -08:00
parent 04a08e7e0c
commit daf1dde701
18 changed files with 726 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayer.java
View File

@ -98,7 +98,7 @@ public class BukkitPlayer extends LocalPlayer {
@Override
public String[] getGroups() {
return plugin.getPermissionsResolver().getGroups(player.getName());
return plugin.getPermissionsResolver().getGroups(player);
}
@Override
@ -110,7 +110,7 @@ public class BukkitPlayer extends LocalPlayer {
public boolean hasPermission(String perm) {
return (!plugin.getLocalConfiguration().noOpPermissions && player.isOp())
|| plugin.getPermissionsResolver().hasPermission(
player.getWorld().getName(), player.getName(), perm);
player.getWorld().getName(), player, perm);
}
@Override

12
src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java
View File

@ -29,6 +29,7 @@ import java.util.logging.Logger;
import java.util.zip.ZipEntry;
import com.sk89q.util.yaml.YAMLProcessor;
import com.sk89q.wepif.PermissionsResolverManager;
import org.bukkit.World;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
@ -37,7 +38,6 @@ import org.bukkit.event.Event.Priority;
import org.bukkit.event.Event;
import org.bukkit.event.Listener;
import org.bukkit.plugin.java.JavaPlugin;
import com.sk89q.bukkit.migration.PermissionsResolverManager;
import com.sk89q.worldedit.*;
import com.sk89q.worldedit.bags.BlockBag;
import com.sk89q.worldedit.bukkit.selections.*;
@ -71,10 +71,6 @@ public class WorldEditPlugin extends JavaPlugin {
* Holds the configuration for WorldEdit.
*/
private BukkitConfiguration config;
/**
* The permissions resolver in use.
*/
private PermissionsResolverManager perms;
/**
* Called on plugin enable.
@ -97,7 +93,7 @@ public class WorldEditPlugin extends JavaPlugin {
// Set up configuration and such, including the permissions
// resolver
config = new BukkitConfiguration(new YAMLProcessor(new File(getDataFolder(), "config.yml"), true), logger);
perms = new PermissionsResolverManager(this, "WorldEdit", logger);
PermissionsResolverManager.initialize(this);
// Load the configuration
loadConfiguration();
@ -135,7 +131,7 @@ public class WorldEditPlugin extends JavaPlugin {
protected void loadConfiguration() {
config.unload();
config.load();
perms.load();
getPermissionsResolver().load();
}
/**
@ -336,7 +332,7 @@ public class WorldEditPlugin extends JavaPlugin {
* @return
*/
public PermissionsResolverManager getPermissionsResolver() {
return perms;
return PermissionsResolverManager.getInstance();
}
/**