1
0
mirror of https://github.com/essentials/Essentials.git synced 2025-09-30 16:19:11 +02:00

New Groups code, supports groups.yml file, gm and vault, new economy api.

This commit is contained in:
snowleo
2012-02-06 22:13:39 +01:00
parent 1078b7b5f2
commit 539700cb21
26 changed files with 789 additions and 275 deletions

View File

@@ -214,9 +214,7 @@ public class User extends UserBase implements IUser
@Cleanup
final ISettings settings = ess.getSettings();
settings.acquireReadLock();
@Cleanup
final IGroups groups = ess.getGroups();
groups.acquireReadLock();
// default: {PREFIX}{NICKNAMEPREFIX}{NAME}{SUFFIX}
String displayname = settings.getData().getChat().getDisplaynameFormat();
if (settings.getData().getCommands().isDisabled("nick") || nick == null || nick.isEmpty() || nick.equals(getName()))
@@ -533,22 +531,6 @@ public class User extends UserBase implements IUser
}
}
@Override
public String getGroup()
{
return ess.getPermissionsHandler().getGroup(base);
}
public boolean inGroup(final String group)
{
return ess.getPermissionsHandler().inGroup(base, group);
}
public boolean canBuild()
{
return ess.getPermissionsHandler().canBuild(base, getGroup());
}
@Override
public Location getHome(String name) throws Exception
{