mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 03:35:51 +00:00
Code Releases Activity

Revert requirePermissionToUse (not ready yet)

Browse Source
This commit is contained in:
Poslovitch 2017-11-22 20:37:30 +01:00
parent f2dd943df3
commit 502efd862b
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunItem.java
View File

@ -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);

2
src/me/mrCookieSlime/Slimefun/api/Slimefun.java
View File

@ -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;