From e8503aa0b9c8746f10e257ab214308c65cb6d437 Mon Sep 17 00:00:00 2001 From: sk89q Date: Mon, 17 Jan 2011 17:55:56 -0800 Subject: [PATCH] Now supports GroupUsers (through WorldEdit). --- .../sk89q/worldguard/bukkit/WorldGuardPlugin.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java b/src/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java index f869e5cc..691f06e1 100644 --- a/src/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java +++ b/src/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java @@ -39,7 +39,8 @@ import org.bukkit.plugin.PluginLoader; import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.util.config.Configuration; -import com.sk89q.bukkit.migration.ConfigurationPermissionsResolver; +import com.sk89q.bukkit.migration.PermissionsResolverManager; +import com.sk89q.bukkit.migration.PermissionsResolverServerListener; import com.sk89q.worldguard.blacklist.Blacklist; import com.sk89q.worldguard.blacklist.BlacklistLogger; import com.sk89q.worldguard.blacklist.loggers.*; @@ -59,7 +60,9 @@ public class WorldGuardPlugin extends JavaPlugin { new WorldGuardBlockListener(this); private final WorldGuardEntityListener entityListener = new WorldGuardEntityListener(this); - private final ConfigurationPermissionsResolver perms; + private final PermissionsResolverServerListener permsListener; + + private final PermissionsResolverManager perms; Blacklist blacklist; @@ -122,7 +125,9 @@ public WorldGuardPlugin(PluginLoader pluginLoader, Server instance, createDefaultConfiguration("blacklist.txt"); regionLoader = new CSVDatabase(new File(folder, "regions.txt")); - perms = new ConfigurationPermissionsResolver(getConfiguration()); + perms = new PermissionsResolverManager(getConfiguration(), getServer(), + "WorldGuard", logger); + permsListener = new PermissionsResolverServerListener(perms); loadConfiguration(); postReload(); registerEvents(); @@ -151,6 +156,8 @@ private void registerEvents() { registerEvent(Event.Type.PLAYER_JOIN, playerListener, Priority.Normal); registerEvent(Event.Type.PLAYER_LOGIN, playerListener, Priority.Normal); registerEvent(Event.Type.PLAYER_QUIT, playerListener, Priority.Normal); + + permsListener.register(this); } private void registerEvent(Event.Type type, Listener listener, Priority priority) {