From bcbb15b96db260db109ef7def6dc39c0c1252500 Mon Sep 17 00:00:00 2001
From: t3hk0d3 <clouster@yandex.ru>
Date: Fri, 2 Mar 2012 18:29:36 +0400
Subject: [PATCH] Fixed whitelist option

---
 .../modifyworld/ModifyworldListener.java      |  4 ++-
 .../ru/tehkode/modifyworld/Toggleable.java    | 35 -------------------
 .../modifyworld/handlers/PlayerListener.java  | 11 ++++--
 3 files changed, 11 insertions(+), 39 deletions(-)
 delete mode 100644 src/main/java/ru/tehkode/modifyworld/Toggleable.java

diff --git a/src/main/java/ru/tehkode/modifyworld/ModifyworldListener.java b/src/main/java/ru/tehkode/modifyworld/ModifyworldListener.java
index 3adf290..92d07f7 100644
--- a/src/main/java/ru/tehkode/modifyworld/ModifyworldListener.java
+++ b/src/main/java/ru/tehkode/modifyworld/ModifyworldListener.java
@@ -45,7 +45,8 @@ public abstract class ModifyworldListener implements Listener {
 	protected boolean useMaterialNames = true;
 	protected boolean checkMetadata = false;
 	protected boolean checkItemUse = false;
-
+	protected boolean enableWhitelist = false;
+	
 	public ModifyworldListener(Plugin plugin, ConfigurationSection config) {
 		this.permissionsManager = PermissionsEx.getPermissionManager();
 		this.config = config;
@@ -57,6 +58,7 @@ public abstract class ModifyworldListener implements Listener {
 		this.useMaterialNames = config.getBoolean("use-material-names", useMaterialNames);
 		this.checkMetadata = config.getBoolean("check-metadata", checkMetadata);
 		this.checkItemUse = config.getBoolean("item-use-check", checkItemUse);
+		this.enableWhitelist = config.getBoolean("whitelist", enableWhitelist);
 	}
 
 	protected void informPlayer(Player player, String message) {
diff --git a/src/main/java/ru/tehkode/modifyworld/Toggleable.java b/src/main/java/ru/tehkode/modifyworld/Toggleable.java
deleted file mode 100644
index f025242..0000000
--- a/src/main/java/ru/tehkode/modifyworld/Toggleable.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Modifyworld - PermissionsEx ruleset plugin for Bukkit
- * Copyright (C) 2011 t3hk0d3 http://www.tehkode.ru
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package ru.tehkode.modifyworld;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- *
- * @author t3hk0d3
- */
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Toggleable {
-    String value();
-    boolean byDefault() default false;
-}
diff --git a/src/main/java/ru/tehkode/modifyworld/handlers/PlayerListener.java b/src/main/java/ru/tehkode/modifyworld/handlers/PlayerListener.java
index 8982bdb..351d459 100644
--- a/src/main/java/ru/tehkode/modifyworld/handlers/PlayerListener.java
+++ b/src/main/java/ru/tehkode/modifyworld/handlers/PlayerListener.java
@@ -31,7 +31,6 @@ import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.Plugin;
 import ru.tehkode.modifyworld.ModifyworldListener;
-import ru.tehkode.modifyworld.Toggleable;
 import ru.tehkode.permissions.PermissionUser;
 
 /**
@@ -74,8 +73,11 @@ public class PlayerListener extends ModifyworldListener {
 	}
 
 	@EventHandler
-	@Toggleable("whitelist")
 	public void onPlayerPreLogin(PlayerPreLoginEvent event) {
+		if (!enableWhitelist) {
+			return;
+		}
+		
 		PermissionUser user = this.permissionsManager.getUser(event.getName());
 
 		if (user != null && !user.has("modifyworld.login", Bukkit.getServer().getWorlds().get(0).getName())) {
@@ -85,8 +87,11 @@ public class PlayerListener extends ModifyworldListener {
 	}
 
 	@EventHandler
-	@Toggleable("whitelist")
 	public void onPlayerLogin(PlayerLoginEvent event) {
+		if (!enableWhitelist) {
+			return;
+		}
+		
 		PermissionUser user = this.permissionsManager.getUser(event.getPlayer());
 
 		if (user != null && !user.has("modifyworld.login", Bukkit.getServer().getWorlds().get(0).getName())) {