From 1bfe63da96ca91a736da95a6a82fc2ef747e3228 Mon Sep 17 00:00:00 2001 From: snowleo Date: Wed, 14 Mar 2012 03:01:23 +0100 Subject: Splitting permissions and ranks (renamed from groups) Deleted all old permissions handlers, since we fully use superperms now --- EssentialsSigns/src/com/earth2me/essentials/signs/SignKit.java | 4 ++-- EssentialsSigns/src/com/earth2me/essentials/signs/SignProtection.java | 2 +- EssentialsSigns/src/com/earth2me/essentials/signs/SignWarp.java | 4 ++-- .../src/com/earth2me/essentials/signs/SignsPermissions.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'EssentialsSigns/src/com/earth2me') diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignKit.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignKit.java index e150edfa2..e54e837bd 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignKit.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignKit.java @@ -4,7 +4,7 @@ import com.earth2me.essentials.api.ChargeException; import com.earth2me.essentials.Trade; import com.earth2me.essentials.api.IEssentials; import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.perm.KitPermissions; +import com.earth2me.essentials.permissions.KitPermissions; import com.earth2me.essentials.settings.Kit; import java.util.Locale; @@ -52,7 +52,7 @@ public class SignKit extends EssentialsSign { final String kitName = sign.getLine(1).toLowerCase(Locale.ENGLISH); final String group = sign.getLine(2); - if ((!group.isEmpty() && ("§2Everyone".equals(group) || ess.getGroups().inGroup(player, group))) + if ((!group.isEmpty() && ("§2Everyone".equals(group) || ess.getRanks().inGroup(player, group))) || (group.isEmpty() && KitPermissions.getPermission(kitName).isAuthorized(player))) { final Trade charge = getTrade(sign, 3, ess); diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignProtection.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignProtection.java index 4b343c977..0131e06c6 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignProtection.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignProtection.java @@ -154,7 +154,7 @@ public class SignProtection extends EssentialsSign for (int i = 1; i <= 2; i++) { final String line = sign.getLine(i); - if (line.startsWith("(") && line.endsWith(")") && ess.getGroups().inGroup(user, line.substring(1, line.length() - 1))) + if (line.startsWith("(") && line.endsWith(")") && ess.getRanks().inGroup(user, line.substring(1, line.length() - 1))) { return SignProtectionState.ALLOWED; } diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignWarp.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignWarp.java index caabbfb04..281618ce6 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignWarp.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignWarp.java @@ -4,7 +4,7 @@ import com.earth2me.essentials.api.ChargeException; import com.earth2me.essentials.Trade; import com.earth2me.essentials.api.IEssentials; import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.perm.WarpPermissions; +import com.earth2me.essentials.permissions.WarpPermissions; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; @@ -51,7 +51,7 @@ public class SignWarp extends EssentialsSign final String warpName = sign.getLine(1); final String group = sign.getLine(2); - if ((!group.isEmpty() && ("§2Everyone".equals(group) || ess.getGroups().inGroup(player, group))) + if ((!group.isEmpty() && ("§2Everyone".equals(group) || ess.getRanks().inGroup(player, group))) || (group.isEmpty() && WarpPermissions.getPermission(warpName).isAuthorized(player))) { final Trade charge = getTrade(sign, 3, ess); diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignsPermissions.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignsPermissions.java index 82c9bdca9..eb8025f5b 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignsPermissions.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignsPermissions.java @@ -1,7 +1,7 @@ package com.earth2me.essentials.signs; import com.earth2me.essentials.api.IPermission; -import com.earth2me.essentials.perm.BasePermission; +import com.earth2me.essentials.permissions.BasePermission; import java.util.HashMap; import java.util.Locale; import java.util.Map; -- cgit v1.2.3