PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

Case shouldn't really matter for groups and permissions

Browse Source
This commit is contained in:
md_5 2013-04-12 19:41:20 +10:00
parent b87fff2614
commit a67d4a1697
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
proxy/src/main/java/net/md_5/bungee/UserConnection.java
View File

@ -224,7 +224,7 @@ public final class UserConnection implements ProxiedPlayer
{ {
for ( String group : groups ) for ( String group : groups )
{ {
playerGroups.add( group ); playerGroups.add( group.toLowerCase() );
for ( String permission : bungee.getConfigurationAdapter().getPermissions( group ) ) for ( String permission : bungee.getConfigurationAdapter().getPermissions( group ) )
{ {
setPermission( permission, true ); setPermission( permission, true );
@ -238,7 +238,7 @@ public final class UserConnection implements ProxiedPlayer
{ {
for ( String group : groups ) for ( String group : groups )
{ {
playerGroups.remove( group ); playerGroups.remove( group.toLowerCase() );
for ( String permission : bungee.getConfigurationAdapter().getPermissions( group ) ) for ( String permission : bungee.getConfigurationAdapter().getPermissions( group ) )
{ {
setPermission( permission, false ); setPermission( permission, false );
@ -250,7 +250,7 @@ public final class UserConnection implements ProxiedPlayer
@Synchronized("permMutex") @Synchronized("permMutex")
public boolean hasPermission(String permission) public boolean hasPermission(String permission)
{ {
return bungee.getPluginManager().callEvent( new PermissionCheckEvent( this, permission, permissions.contains( permission ) ) ).hasPermission(); return bungee.getPluginManager().callEvent( new PermissionCheckEvent( this, permission, permissions.contains( permission.toLowerCase() ) ) ).hasPermission();
} }
@Override @Override
@ -259,10 +259,10 @@ public final class UserConnection implements ProxiedPlayer
{ {
if ( value ) if ( value )
{ {
permissions.add( permission ); permissions.add( permission.toLowerCase() );
} else } else
{ {
permissions.remove( permission ); permissions.remove( permission.toLowerCase() );
} }
} }

4
proxy/src/main/java/net/md_5/bungee/config/YamlConfig.java
View File

@ -201,7 +201,7 @@ public class YamlConfig implements ConfigurationAdapter
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public Collection<String> getGroups(String player) public Collection<String> getGroups(String player)
{ {
Collection<String> groups = get( "groups." + player, null ); Collection<String> groups = get( "groups." + player.toLowerCase(), null );
Collection<String> ret = ( groups == null ) ? new HashSet<String>() : new HashSet<>( groups ); Collection<String> ret = ( groups == null ) ? new HashSet<String>() : new HashSet<>( groups );
ret.add( "default" ); ret.add( "default" );
return ret; return ret;
@ -211,6 +211,6 @@ public class YamlConfig implements ConfigurationAdapter
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public Collection<String> getPermissions(String group) public Collection<String> getPermissions(String group)
{ {
return get( "permissions." + group, Collections.EMPTY_LIST ); return get( "permissions." + group.toLowerCase(), Collections.EMPTY_LIST );
} }
} }