summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2012-09-08 20:32:48 +0100
committerKHobbits <rob@khobbits.co.uk>2012-09-08 20:32:48 +0100
commit9c9d4e1da5eaf761108cc2edda71233109e0787b (patch)
tree9611c20b8060de39dd6edadaf4364c1030378032
parentce50e1448b2daacf3b9b53c90b602625c95b1bb3 (diff)
downloadEssentials-9c9d4e1da5eaf761108cc2edda71233109e0787b.tar
Essentials-9c9d4e1da5eaf761108cc2edda71233109e0787b.tar.gz
Essentials-9c9d4e1da5eaf761108cc2edda71233109e0787b.tar.lz
Essentials-9c9d4e1da5eaf761108cc2edda71233109e0787b.tar.xz
Essentials-9c9d4e1da5eaf761108cc2edda71233109e0787b.zip
Move the per kit and warp permissions:
essentials.kit.kitname is moved to essentials.kits.kitname essentials.warp.warpname is moved to essentials.warps.warpname
-rw-r--r--Essentials/src/com/earth2me/essentials/Kit.java2
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandkit.java4
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandwarp.java4
3 files changed, 5 insertions, 5 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Kit.java b/Essentials/src/com/earth2me/essentials/Kit.java
index 46c75ed1e..d0a3b5d7e 100644
--- a/Essentials/src/com/earth2me/essentials/Kit.java
+++ b/Essentials/src/com/earth2me/essentials/Kit.java
@@ -23,7 +23,7 @@ public class Kit
final StringBuilder list = new StringBuilder();
for (String kiteItem : kits.getKeys(false))
{
- if (user == null || user.isAuthorized("essentials.kit." + kiteItem.toLowerCase(Locale.ENGLISH)))
+ if (user == null || user.isAuthorized("essentials.kits." + kiteItem.toLowerCase(Locale.ENGLISH)))
{
list.append(" ").append(capitalCase(kiteItem));
}
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandkit.java b/Essentials/src/com/earth2me/essentials/commands/Commandkit.java
index d12cd5f26..e3a7de160 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandkit.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandkit.java
@@ -72,9 +72,9 @@ public class Commandkit extends EssentialsCommand
final Map<String, Object> kit = ess.getSettings().getKit(kitName);
- if (!userFrom.isAuthorized("essentials.kit." + kitName))
+ if (!userFrom.isAuthorized("essentials.kits." + kitName))
{
- throw new Exception(_("noKitPermission", "essentials.kit." + kitName));
+ throw new Exception(_("noKitPermission", "essentials.kits." + kitName));
}
final List<String> items = Kit.getItems(userTo, kit);
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandwarp.java b/Essentials/src/com/earth2me/essentials/commands/Commandwarp.java
index f3727548f..be91f6d8b 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandwarp.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandwarp.java
@@ -87,7 +87,7 @@ public class Commandwarp extends EssentialsCommand
while (iterator.hasNext())
{
final String warpName = iterator.next();
- if (ess.getSettings().getPerWarpPermission() && !((User)sender).isAuthorized("essentials.warp." + warpName))
+ if (ess.getSettings().getPerWarpPermission() && !((User)sender).isAuthorized("essentials.warps." + warpName))
{
iterator.remove();
}
@@ -120,7 +120,7 @@ public class Commandwarp extends EssentialsCommand
final double fullCharge = chargeWarp.getCommandCost(user) + chargeCmd.getCommandCost(user);
final Trade charge = new Trade(fullCharge, ess);
charge.isAffordableFor(owner);
- if (ess.getSettings().getPerWarpPermission() && !owner.isAuthorized("essentials.warp." + name))
+ if (ess.getSettings().getPerWarpPermission() && !owner.isAuthorized("essentials.warps." + name))
{
throw new Exception(_("warpUsePermission"));
}