Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-11-28 05:25:20 +01:00
Code Issues Projects Releases Wiki Activity

Now supports GroupUsers (through WorldEdit).

Browse Source
This commit is contained in:
sk89q 2011-01-17 17:55:56 -08:00
parent 01bf9e8406
commit e8503aa0b9
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java
View File

@ -39,7 +39,8 @@
import org.bukkit.plugin.PluginLoader; import org.bukkit.plugin.PluginLoader;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import org.bukkit.util.config.Configuration; 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.Blacklist;
import com.sk89q.worldguard.blacklist.BlacklistLogger; import com.sk89q.worldguard.blacklist.BlacklistLogger;
import com.sk89q.worldguard.blacklist.loggers.*; import com.sk89q.worldguard.blacklist.loggers.*;
@ -59,7 +60,9 @@ public class WorldGuardPlugin extends JavaPlugin {
new WorldGuardBlockListener(this); new WorldGuardBlockListener(this);
private final WorldGuardEntityListener entityListener = private final WorldGuardEntityListener entityListener =
new WorldGuardEntityListener(this); new WorldGuardEntityListener(this);
private final ConfigurationPermissionsResolver perms; private final PermissionsResolverServerListener permsListener;
private final PermissionsResolverManager perms;
Blacklist blacklist; Blacklist blacklist;
@ -122,7 +125,9 @@ public WorldGuardPlugin(PluginLoader pluginLoader, Server instance,
createDefaultConfiguration("blacklist.txt"); createDefaultConfiguration("blacklist.txt");
regionLoader = new CSVDatabase(new File(folder, "regions.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(); loadConfiguration();
postReload(); postReload();
registerEvents(); registerEvents();
@ -151,6 +156,8 @@ private void registerEvents() {
registerEvent(Event.Type.PLAYER_JOIN, playerListener, Priority.Normal); registerEvent(Event.Type.PLAYER_JOIN, playerListener, Priority.Normal);
registerEvent(Event.Type.PLAYER_LOGIN, playerListener, Priority.Normal); registerEvent(Event.Type.PLAYER_LOGIN, playerListener, Priority.Normal);
registerEvent(Event.Type.PLAYER_QUIT, playerListener, Priority.Normal); registerEvent(Event.Type.PLAYER_QUIT, playerListener, Priority.Normal);
permsListener.register(this);
} }
private void registerEvent(Event.Type type, Listener listener, Priority priority) { private void registerEvent(Event.Type type, Listener listener, Priority priority) {