SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests 1 Aktivität

[Bleeding] Lazily calculate permissions. Addresses BUKKIT-1122

Quellcode durchsuchen 
By: Wesley Wolfe <weswolf@aol.com>
Dieser Commit ist enthalten in:
Bukkit/Spigot 2012-03-10 15:05:59 -06:00
Ursprung a9dd81a309
Commit 1cbbdebfe3
1 geänderte Dateien mit 13 neuen und 12 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

25
paper-api/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java
Datei anzeigen

@ -34,6 +34,7 @@ public final class PluginDescriptionFile {
private boolean database = false; private boolean database = false;
private PluginLoadOrder order = PluginLoadOrder.POSTWORLD; private PluginLoadOrder order = PluginLoadOrder.POSTWORLD;
private List<Permission> permissions = null; private List<Permission> permissions = null;
private Map<?, ?> lazyPermissions = null;
private PermissionDefault defaultPerm = PermissionDefault.OP; private PermissionDefault defaultPerm = PermissionDefault.OP;
public PluginDescriptionFile(final InputStream stream) throws InvalidDescriptionException { public PluginDescriptionFile(final InputStream stream) throws InvalidDescriptionException {
@ -150,6 +151,14 @@ public final class PluginDescriptionFile {
} }
public List<Permission> getPermissions() { public List<Permission> getPermissions() {
if (permissions == null) {
if (lazyPermissions == null) {
permissions = ImmutableList.<Permission>of();
} else {
permissions = ImmutableList.copyOf(Permission.loadPermissions(lazyPermissions, "Permission node '%s' in plugin description file for " + getFullName() + " is invalid", defaultPerm));
lazyPermissions = null;
}
}
return permissions; return permissions;
} }
@ -315,18 +324,10 @@ public final class PluginDescriptionFile {
} }
} }
if (map.get("permissions") != null) { try {
try { lazyPermissions = (Map<?, ?>) map.get("permissions");
Map<?, ?> perms = (Map<?, ?>) map.get("permissions"); } catch (ClassCastException ex) {
throw new InvalidDescriptionException(ex, "permissions are of the wrong type");
permissions = ImmutableList.copyOf(Permission.loadPermissions(perms, "Permission node '%s' in plugin description file for " + getFullName() + " is invalid", defaultPerm));
} catch (ClassCastException ex) {
throw new InvalidDescriptionException(ex, "permissions are of wrong type");
} catch (NullPointerException ex) {
throw new InvalidDescriptionException(ex, "permissions are not properly defined");
}
} else {
permissions = ImmutableList.<Permission>of();
} }
if (map.get("prefix") != null) { if (map.get("prefix") != null) {