diff --git a/src/com/massivecraft/massivecore/MassiveCoreMConf.java b/src/com/massivecraft/massivecore/MassiveCoreMConf.java index e54bd25f..67cb693b 100644 --- a/src/com/massivecraft/massivecore/MassiveCoreMConf.java +++ b/src/com/massivecraft/massivecore/MassiveCoreMConf.java @@ -11,7 +11,7 @@ import com.massivecraft.massivecore.command.editor.annotation.EditorType; import com.massivecraft.massivecore.command.type.TypeMillisDiff; import com.massivecraft.massivecore.store.Entity; import com.massivecraft.massivecore.util.MUtil; -import com.massivecraft.massivecore.util.PermUtil; +import com.massivecraft.massivecore.util.PermissionUtil; import com.massivecraft.massivecore.util.TimeUnit; import com.massivecraft.massivecore.xlib.mongodb.WriteConcern; @@ -80,7 +80,7 @@ public class MassiveCoreMConf extends Entity public int getTpdelay(Permissible permissible) { - Integer ret = PermUtil.pickFirstVal(permissible, permissionToTpdelay); + Integer ret = PermissionUtil.pickFirstVal(permissible, permissionToTpdelay); if (ret == null) ret = 0; return ret; } diff --git a/src/com/massivecraft/massivecore/MassiveCorePerm.java b/src/com/massivecraft/massivecore/MassiveCorePerm.java index 0126bec9..3da5f85f 100644 --- a/src/com/massivecraft/massivecore/MassiveCorePerm.java +++ b/src/com/massivecraft/massivecore/MassiveCorePerm.java @@ -2,7 +2,7 @@ package com.massivecraft.massivecore; import org.bukkit.permissions.Permissible; -import com.massivecraft.massivecore.util.PermUtil; +import com.massivecraft.massivecore.util.PermissionUtil; public enum MassiveCorePerm { @@ -73,7 +73,7 @@ public enum MassiveCorePerm public boolean has(Permissible permissible, boolean informSenderIfNot) { - return PermUtil.has(permissible, this.node, informSenderIfNot); + return PermissionUtil.has(permissible, this.node, informSenderIfNot); } public boolean has(Permissible permissible) diff --git a/src/com/massivecraft/massivecore/command/MassiveCommand.java b/src/com/massivecraft/massivecore/command/MassiveCommand.java index 98915fdb..cce9c858 100644 --- a/src/com/massivecraft/massivecore/command/MassiveCommand.java +++ b/src/com/massivecraft/massivecore/command/MassiveCommand.java @@ -31,7 +31,7 @@ import com.massivecraft.massivecore.command.type.Type; import com.massivecraft.massivecore.mixin.MixinMessage; import com.massivecraft.massivecore.mson.Mson; import com.massivecraft.massivecore.predicate.PredicateStartsWithIgnoreCase; -import com.massivecraft.massivecore.util.PermUtil; +import com.massivecraft.massivecore.util.PermissionUtil; import com.massivecraft.massivecore.util.Txt; public class MassiveCommand implements Active, PluginIdentifiableCommand @@ -739,7 +739,7 @@ public class MassiveCommand implements Active, PluginIdentifiableCommand String perm = this.getDescPermission(); if (perm != null) { - String pdesc = PermUtil.getDescription(perm); + String pdesc = PermissionUtil.getDescription(perm); if (pdesc != null) { return pdesc; diff --git a/src/com/massivecraft/massivecore/command/requirement/RequirementHasPerm.java b/src/com/massivecraft/massivecore/command/requirement/RequirementHasPerm.java index 741cf6ca..6fcad63c 100644 --- a/src/com/massivecraft/massivecore/command/requirement/RequirementHasPerm.java +++ b/src/com/massivecraft/massivecore/command/requirement/RequirementHasPerm.java @@ -3,7 +3,7 @@ package com.massivecraft.massivecore.command.requirement; import org.bukkit.command.CommandSender; import com.massivecraft.massivecore.command.MassiveCommand; -import com.massivecraft.massivecore.util.PermUtil; +import com.massivecraft.massivecore.util.PermissionUtil; public class RequirementHasPerm extends RequirementAbstract { @@ -36,7 +36,7 @@ public class RequirementHasPerm extends RequirementAbstract @Override public String createErrorMessage(CommandSender sender, MassiveCommand command) { - return PermUtil.getDeniedMessage(this.perm); + return PermissionUtil.getDeniedMessage(this.perm); } } diff --git a/src/com/massivecraft/massivecore/store/SenderEntity.java b/src/com/massivecraft/massivecore/store/SenderEntity.java index 246b05ce..2042f0fa 100644 --- a/src/com/massivecraft/massivecore/store/SenderEntity.java +++ b/src/com/massivecraft/massivecore/store/SenderEntity.java @@ -16,7 +16,7 @@ import com.massivecraft.massivecore.mixin.MixinPlayed; import com.massivecraft.massivecore.mixin.MixinVisibility; import com.massivecraft.massivecore.mson.Mson; import com.massivecraft.massivecore.util.IdUtil; -import com.massivecraft.massivecore.util.PermUtil; +import com.massivecraft.massivecore.util.PermissionUtil; public abstract class SenderEntity> extends Entity implements Named { @@ -75,7 +75,7 @@ public abstract class SenderEntity> extends Entity T ret = super.convertGet(value, defaultValue); // Permission Requirement - if ( ! Objects.equal(value, defaultValue) && ! PermUtil.has(this.getSender(), permission)) return defaultValue; + if ( ! Objects.equal(value, defaultValue) && ! PermissionUtil.has(this.getSender(), permission)) return defaultValue; // Return return ret; diff --git a/src/com/massivecraft/massivecore/util/PermUtil.java b/src/com/massivecraft/massivecore/util/PermissionUtil.java similarity index 96% rename from src/com/massivecraft/massivecore/util/PermUtil.java rename to src/com/massivecraft/massivecore/util/PermissionUtil.java index ea5d8b21..60fd3d66 100644 --- a/src/com/massivecraft/massivecore/util/PermUtil.java +++ b/src/com/massivecraft/massivecore/util/PermissionUtil.java @@ -13,7 +13,7 @@ import com.massivecraft.massivecore.Lang; import com.massivecraft.massivecore.MassiveCore; import com.massivecraft.massivecore.event.EventMassiveCorePermissionDeniedFormat; -public class PermUtil +public class PermissionUtil { // -------------------------------------------- // // HAS diff --git a/src/com/massivecraft/massivecore/util/SignUtil.java b/src/com/massivecraft/massivecore/util/SignUtil.java index 96b1b314..8d2bf8b6 100644 --- a/src/com/massivecraft/massivecore/util/SignUtil.java +++ b/src/com/massivecraft/massivecore/util/SignUtil.java @@ -126,7 +126,7 @@ public class SignUtil if ( ! title.equalsIgnoreCase(lenientTitle)) return false; // ... verify that the player has permission to create that type of sign ... - if ( ! PermUtil.has(player, permissionNode, true)) + if ( ! PermissionUtil.has(player, permissionNode, true)) { event.setCancelled(true); return false;