minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-16 11:37:30 +02:00
Code Issues Releases Wiki Activity

Getting rid of locks, part one

Browse Source
This commit is contained in:
snowleo
2012-10-06 15:31:59 +02:00
parent f2e31e56c5
commit 463c4ff62d
32 changed files with 432 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
EssentialsSigns/src/net/ess3/signs/EssentialsSign.java
View File

@@ -34,7 +34,7 @@ public class EssentialsSign
{
final ISign sign = new EventSign(event);
final IUser user = ess.getUserMap().getUser(event.getPlayer());
if (!SignsPermissions.getCreatePermission(signName).isAuthorized(user))
if (!SignsPermissions.CREATE.isAuthorized(user, signName))
{
// Return true, so other plugins can use the same sign title, just hope
// they won't change it to §1[Signname]
@@ -83,7 +83,7 @@ public class EssentialsSign
final IUser user = ess.getUserMap().getUser(player);
try
{
return SignsPermissions.getUsePermission(signName).isAuthorized(user)
return SignsPermissions.USE.isAuthorized(user, signName)
&& onSignInteract(sign, user, getUsername(user), ess);
}
catch (ChargeException ex)
@@ -104,7 +104,7 @@ public class EssentialsSign
final IUser user = ess.getUserMap().getUser(player);
try
{
return SignsPermissions.getBreakPermission(signName).isAuthorized(user)
return SignsPermissions.BREAK.isAuthorized(user, signName)
&& onSignBreak(sign, user, getUsername(user), ess);
}
catch (SignException ex)

3
EssentialsSigns/src/net/ess3/signs/SignBlockListener.java
View File

@@ -6,6 +6,7 @@ import net.ess3.api.IUser;
import net.ess3.utils.Util;
import java.util.logging.Level;
import java.util.logging.Logger;
import net.ess3.permissions.Permissions;
import net.ess3.utils.FormatUtil;
import org.bukkit.Material;
import org.bukkit.block.Block;
@@ -92,7 +93,7 @@ public class SignBlockListener implements Listener
for (int i = 0; i < 4; i++)
{
event.setLine(i, FormatUtil.formatString(user, "essentials.signs", event.getLine(i)));
event.setLine(i, FormatUtil.formatString(user, Permissions.SIGNS, event.getLine(i)));
}
for (Signs signs : Signs.values())

40
EssentialsSigns/src/net/ess3/signs/SignsPermissions.java
View File

@@ -5,6 +5,7 @@ import net.ess3.permissions.BasePermission;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import net.ess3.permissions.DotStarPermission;
public class SignsPermissions
@@ -12,40 +13,7 @@ public class SignsPermissions
public static final IPermission COLOR = new BasePermission("essentials.signs.", "color");
public static final IPermission PROTECTION_OVERRIDE = new BasePermission("essentials.signs.protection.", "override");
public static final IPermission TRADE_OVERRIDE = new BasePermission("essentials.signs.trade.", "override");
private static Map<String, IPermission> createpermissions = new HashMap<String, IPermission>();
public static IPermission getCreatePermission(final String signName)
{
IPermission perm = createpermissions.get(signName);
if (perm == null)
{
perm = new BasePermission("essentials.signs.create.", signName.toLowerCase(Locale.ENGLISH));
createpermissions.put(signName, perm);
}
return perm;
}
private static Map<String, IPermission> usepermissions = new HashMap<String, IPermission>();
public static IPermission getUsePermission(final String signName)
{
IPermission perm = usepermissions.get(signName);
if (perm == null)
{
perm = new BasePermission("essentials.signs.use.", signName.toLowerCase(Locale.ENGLISH));
usepermissions.put(signName, perm);
}
return perm;
}
private static Map<String, IPermission> breakpermissions = new HashMap<String, IPermission>();
public static IPermission getBreakPermission(final String signName)
{
IPermission perm = breakpermissions.get(signName);
if (perm == null)
{
perm = new BasePermission("essentials.signs.break.", signName.toLowerCase(Locale.ENGLISH));
breakpermissions.put(signName, perm);
}
return perm;
}
public static final DotStarPermission CREATE = new DotStarPermission("essentials.signs.create");
public static final DotStarPermission USE = new DotStarPermission("essentials.signs.use");
public static final DotStarPermission BREAK = new DotStarPermission("essentials.signs.break");
}