From 502efd862b23f2d940de9500425b6b11e2cd069f Mon Sep 17 00:00:00 2001
From: Poslovitch <poslovitch@gmail.com>
Date: Wed, 22 Nov 2017 20:37:30 +0100
Subject: [PATCH] Revert requirePermissionToUse (not ready yet)

---
 .../Slimefun/Objects/SlimefunItem/SlimefunItem.java        | 7 -------
 src/me/mrCookieSlime/Slimefun/api/Slimefun.java            | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunItem.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunItem.java
index a56964418..26657db20 100644
--- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunItem.java
+++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunItem.java
@@ -62,7 +62,6 @@ public class SlimefunItem {
 	private boolean replacing = false;
 	private boolean addon = false;
 	private String permission = "";
-	private boolean requirePermissionToUse = false;
 	private Set<ItemHandler> itemhandlers = new HashSet<ItemHandler>();
 	private boolean ticking = false;
 	private BlockTicker blockTicker;
@@ -198,10 +197,6 @@ public class SlimefunItem {
 	 * @since 4.1.11
 	 */
 	public String getPermission() 		{		return permission;		}
-	/**
-	 * @since 4.1.11
-	 */
-	public boolean requirePermissionToUse() {	return requirePermissionToUse;	}
 	public Set<ItemHandler> getHandlers() {		return itemhandlers;	}
 	public boolean isTicking() 			{		return ticking;			}
 	/**
@@ -235,7 +230,6 @@ public class SlimefunItem {
 			SlimefunStartup.getItemCfg().setDefaultValue(id + ".allow-enchanting", enchantable);
 			SlimefunStartup.getItemCfg().setDefaultValue(id + ".allow-disenchanting", disenchantable);
 			SlimefunStartup.getItemCfg().setDefaultValue(id + ".required-permission", permission);
-			SlimefunStartup.getItemCfg().setDefaultValue(id + ".require-permission-to-use", requirePermissionToUse);
 			if (keys != null && values != null) {
 				for (int i = 0; i < keys.length; i++) {
 					SlimefunStartup.getItemCfg().setDefaultValue(id + "." + keys[i], values[i]);
@@ -262,7 +256,6 @@ public class SlimefunItem {
 				enchantable = SlimefunStartup.getItemCfg().getBoolean(id + ".allow-enchanting");
 				disenchantable = SlimefunStartup.getItemCfg().getBoolean(id + ".allow-disenchanting");
 				permission = SlimefunStartup.getItemCfg().getString(id + ".required-permission");
-				requirePermissionToUse = SlimefunStartup.getItemCfg().getBoolean(id + ".require-permission-to-use");
 				items.add(this);
 				if (slimefun) vanilla++;
 				map_id.put(id, urid);
diff --git a/src/me/mrCookieSlime/Slimefun/api/Slimefun.java b/src/me/mrCookieSlime/Slimefun/api/Slimefun.java
index 771325275..c403687f8 100644
--- a/src/me/mrCookieSlime/Slimefun/api/Slimefun.java
+++ b/src/me/mrCookieSlime/Slimefun/api/Slimefun.java
@@ -185,7 +185,7 @@ public class Slimefun {
 	public static boolean hasPermission(Player p, SlimefunItem item, boolean message) {
 		if (item == null) return true;
 		else if (item.getPermission().equalsIgnoreCase("")) return true;
-		else if (item.requirePermissionToUse() && p.hasPermission(item.getPermission())) return true;
+		else if (p.hasPermission(item.getPermission())) return true;
 		else {
 			if (message) Messages.local.sendTranslation(p, "messages.no-permission", true);
 			return false;