mirror of
https://github.com/essentials/Essentials.git
synced 2025-08-22 06:12:56 +02:00
Splitting permissions and ranks (renamed from groups)
Deleted all old permissions handlers, since we fully use superperms now
This commit is contained in:
@@ -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);
|
||||
|
@@ -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;
|
||||
}
|
||||
|
@@ -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);
|
||||
|
@@ -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;
|
||||
|
Reference in New Issue
Block a user