Browse Source

Minor changes

master
Stanislav Usenkov 10 years ago
parent
commit
05bde21e60
  1. 16
      src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitPermissionManager.java
  2. 7
      src/main/java/ru/simsonic/rscPermissions/Engine/InternalCache.java

16
src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitPermissionManager.java

@ -103,24 +103,22 @@ public class BukkitPermissionManager extends RestartableThread
// Remove old // Remove old
if(attachments.containsKey(player)) if(attachments.containsKey(player))
attachments.remove(player).remove(); attachments.remove(player).remove();
// Create new // Create new and fill with permissions
final Map<String, Boolean> pp = persistentPermissions.get(player);
final Map<String, Boolean> tp = transientPermissions.get(player);
if(pp == null && tp == null)
return;
final PermissionAttachment attachment = player.addAttachment(rscp); final PermissionAttachment attachment = player.addAttachment(rscp);
attachments.put(player, attachment); attachments.put(player, attachment);
if(pp != null) final Map<String, Boolean> pp = persistentPermissions.get(player);
if(pp != null && !pp.isEmpty())
for(Map.Entry<String, Boolean> row : pp.entrySet()) for(Map.Entry<String, Boolean> row : pp.entrySet())
attachment.setPermission(row.getKey(), row.getValue()); attachment.setPermission(row.getKey(), row.getValue());
if(tp != null) final Map<String, Boolean> tp = transientPermissions.get(player);
if(tp != null && !tp.isEmpty())
for(Map.Entry<String, Boolean> row : tp.entrySet()) for(Map.Entry<String, Boolean> row : tp.entrySet())
attachment.setPermission(row.getKey(), row.getValue()); attachment.setPermission(row.getKey(), row.getValue());
// Server operator // Give/Reset Server Operator status
final Boolean asterisk = attachment.getPermissions().get("*"); final Boolean asterisk = attachment.getPermissions().get("*");
if(rscp.settings.isAsteriskOP()) if(rscp.settings.isAsteriskOP())
player.setOp((asterisk != null) ? asterisk : false); player.setOp((asterisk != null) ? asterisk : false);
// Debugging information // Show debugging information
if(isDebugging(player)) if(isDebugging(player))
player.sendMessage(GenericChatCodes.processStringStatic(Settings.chatPrefix player.sendMessage(GenericChatCodes.processStringStatic(Settings.chatPrefix
+ "[DEBUG] {_DS}Inheritances list: {_LS}" + result.groups.toString() + "[DEBUG] {_DS}Inheritances list: {_LS}" + result.groups.toString()

7
src/main/java/ru/simsonic/rscPermissions/Engine/InternalCache.java

@ -7,6 +7,7 @@ import java.util.HashSet;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Set;
import ru.simsonic.rscPermissions.API.EntityType; import ru.simsonic.rscPermissions.API.EntityType;
import ru.simsonic.rscPermissions.API.PlayerType; import ru.simsonic.rscPermissions.API.PlayerType;
import ru.simsonic.rscPermissions.API.RowEntity; import ru.simsonic.rscPermissions.API.RowEntity;
@ -283,7 +284,7 @@ public class InternalCache
? row.destination.isRegionApplicable(params.destRegions, params.instantiator) ? row.destination.isRegionApplicable(params.destRegions, params.instantiator)
: false; : false;
} }
public RowEntity getGroup(String group) public synchronized RowEntity getGroup(String group)
{ {
if(group != null && !"".equals(group)) if(group != null && !"".equals(group))
{ {
@ -293,6 +294,10 @@ public class InternalCache
} }
return new RowEntity(); return new RowEntity();
} }
public synchronized Set<String> getGroups()
{
return entities_g.keySet();
}
public synchronized void clear() public synchronized void clear()
{ {
entities_g.clear(); entities_g.clear();

Loading…
Cancel
Save