Repo-Mirror/AkarinMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Fixes LuckPerms compatibility - GH-81

Browse Source
This commit is contained in:
Sotr
2019-04-01 15:23:06 +08:00
parent 9c9f07f750
commit eda69152f0
1 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/api/main/java/org/bukkit/plugin/SimplePluginManager.java
View File

@@ -60,7 +60,7 @@ public final class SimplePluginManager implements PluginManager {
private final SimpleCommandMap commandMap; private final SimpleCommandMap commandMap;
private Map<String, Permission> permissions = Collections.emptyMap(); // Akarin private Map<String, Permission> permissions = Collections.emptyMap(); // Akarin
private final Object permissionsLock = new Object(); private final Object permissionsLock = new Object();
private HashIntObjMap<Set<Permission>> defaultPerms; // Akarin private Map<Boolean, Set<Permission>> defaultPerms; // Akarin
private final Map<String, Map<Permissible, Boolean>> permSubs = HashObjObjMaps.newMutableMap(); // Akarin private final Map<String, Map<Permissible, Boolean>> permSubs = HashObjObjMaps.newMutableMap(); // Akarin
private final Object permSubsLock = new Object(); private final Object permSubsLock = new Object();
private final Map<Boolean, Map<Permissible, Boolean>> defSubs = HashObjObjMaps.newMutableMap(); // Akarin private final Map<Boolean, Map<Permissible, Boolean>> defSubs = HashObjObjMaps.newMutableMap(); // Akarin
@@ -71,9 +71,9 @@ public final class SimplePluginManager implements PluginManager {
this.commandMap = commandMap; this.commandMap = commandMap;
// Akarin start // Akarin start
HashIntObjMap<Set<Permission>> defaultPerms = HashIntObjMaps.newUpdatableMap(); HashObjObjMap<Boolean, Set<Permission>> defaultPerms = HashObjObjMaps.newUpdatableMap();
defaultPerms.put(1, HashObjSets.newUpdatableSet()); defaultPerms.put(Boolean.TRUE, HashObjSets.newUpdatableSet());
defaultPerms.put(0, HashObjSets.newUpdatableSet()); defaultPerms.put(Boolean.FALSE, HashObjSets.newUpdatableSet());
this.defaultPerms = defaultPerms; this.defaultPerms = defaultPerms;
// Akarin end // Akarin end
} }
@@ -510,7 +510,10 @@ public final class SimplePluginManager implements PluginManager {
// Akarin start // Akarin start
//defaultPerms.get(true).clear(); //defaultPerms.get(true).clear();
//defaultPerms.get(false).clear(); //defaultPerms.get(false).clear();
defaultPerms = HashIntObjMaps.newImmutableMap(HashObjSets.newImmutableSetOf(0, 1), HashObjSets.newImmutableSetOf(HashObjSets.newMutableSet(), HashObjSets.newMutableSet())); HashObjObjMap<Boolean, Set<Permission>> defaultPerms = HashObjObjMaps.newUpdatableMap();
defaultPerms.put(Boolean.TRUE, HashObjSets.newUpdatableSet());
defaultPerms.put(Boolean.FALSE, HashObjSets.newUpdatableSet());
this.defaultPerms = defaultPerms;
// Akarin end // Akarin end
} }
} }
@@ -661,7 +664,7 @@ public final class SimplePluginManager implements PluginManager {
@Nonnull // Akarin - javax.annotation @Nonnull // Akarin - javax.annotation
public Set<Permission> getDefaultPermissions(boolean op) { public Set<Permission> getDefaultPermissions(boolean op) {
return defaultPerms.get(op ? 1 : 0); // Akarin - primitive type return defaultPerms.get(op);
} }
public void removePermission(@Nonnull Permission perm) { // Akarin - javax.annotation public void removePermission(@Nonnull Permission perm) { // Akarin - javax.annotation
@@ -681,14 +684,14 @@ public final class SimplePluginManager implements PluginManager {
public void recalculatePermissionDefaults(@Nonnull Permission perm) { // Akarin - javax.annotation public void recalculatePermissionDefaults(@Nonnull Permission perm) { // Akarin - javax.annotation
if (perm != null && permissions.containsKey(perm.getName().toLowerCase(java.util.Locale.ENGLISH))) { if (perm != null && permissions.containsKey(perm.getName().toLowerCase(java.util.Locale.ENGLISH))) {
// Akarin start // Akarin start
HashIntObjMap<Set<Permission>> toImmutable = HashIntObjMaps.newUpdatableMap(defaultPerms); HashObjObjMap<Boolean, Set<Permission>> toImmutable = HashObjObjMaps.newUpdatableMap(defaultPerms);
Set<Permission> toImmutableValueOp = HashObjSets.newMutableSet(defaultPerms.get(1)); Set<Permission> toImmutableValueOp = HashObjSets.newMutableSet(defaultPerms.get(Boolean.TRUE));
toImmutableValueOp.remove(perm); toImmutableValueOp.remove(perm);
toImmutable.put(1, HashObjSets.newImmutableSet(toImmutableValueOp)); toImmutable.put(Boolean.TRUE, HashObjSets.newImmutableSet(toImmutableValueOp));
Set<Permission> toImmutableValue = HashObjSets.newMutableSet(defaultPerms.get(0)); Set<Permission> toImmutableValue = HashObjSets.newMutableSet(defaultPerms.get(Boolean.FALSE));
toImmutableValue.remove(perm); toImmutableValue.remove(perm);
toImmutable.put(0, HashObjSets.newImmutableSet(toImmutableValue)); toImmutable.put(Boolean.FALSE, HashObjSets.newImmutableSet(toImmutableValue));
defaultPerms = toImmutable; defaultPerms = toImmutable;
// Akarin end // Akarin end
@@ -700,10 +703,10 @@ public final class SimplePluginManager implements PluginManager {
private void calculatePermissionDefault(@Nonnull Permission perm, boolean dirty) { // Akarin - javax.annotation private void calculatePermissionDefault(@Nonnull Permission perm, boolean dirty) { // Akarin - javax.annotation
if ((perm.getDefault() == PermissionDefault.OP) || (perm.getDefault() == PermissionDefault.TRUE)) { if ((perm.getDefault() == PermissionDefault.OP) || (perm.getDefault() == PermissionDefault.TRUE)) {
// Akarin start // Akarin start
HashIntObjMap<Set<Permission>> toImmutable = HashIntObjMaps.newUpdatableMap(defaultPerms); HashObjObjMap<Boolean, Set<Permission>> toImmutable = HashObjObjMaps.newUpdatableMap(defaultPerms);
Set<Permission> toImmutableValue = HashObjSets.newUpdatableSet(defaultPerms.get(1)); Set<Permission> toImmutableValue = HashObjSets.newUpdatableSet(defaultPerms.get(Boolean.TRUE));
toImmutableValue.add(perm); toImmutableValue.add(perm);
toImmutable.put(1, HashObjSets.newImmutableSet(toImmutableValue)); toImmutable.put(Boolean.TRUE, HashObjSets.newImmutableSet(toImmutableValue));
defaultPerms = toImmutable; defaultPerms = toImmutable;
// Akarin end // Akarin end
if (dirty) { if (dirty) {
@@ -712,10 +715,10 @@ public final class SimplePluginManager implements PluginManager {
} }
if ((perm.getDefault() == PermissionDefault.NOT_OP) || (perm.getDefault() == PermissionDefault.TRUE)) { if ((perm.getDefault() == PermissionDefault.NOT_OP) || (perm.getDefault() == PermissionDefault.TRUE)) {
// Akarin start // Akarin start
HashIntObjMap<Set<Permission>> toImmutable = HashIntObjMaps.newUpdatableMap(defaultPerms); HashObjObjMap<Boolean, Set<Permission>> toImmutable = HashObjObjMaps.newUpdatableMap(defaultPerms);
Set<Permission> toImmutableValue = HashObjSets.newUpdatableSet(defaultPerms.get(0)); Set<Permission> toImmutableValue = HashObjSets.newUpdatableSet(defaultPerms.get(Boolean.FALSE));
toImmutableValue.add(perm); toImmutableValue.add(perm);
toImmutable.put(0, HashObjSets.newImmutableSet(toImmutableValue)); toImmutable.put(Boolean.FALSE, HashObjSets.newImmutableSet(toImmutableValue));
defaultPerms = toImmutable; defaultPerms = toImmutable;
// Akarin end // Akarin end
if (dirty) { if (dirty) {
@@ -839,7 +842,10 @@ public final class SimplePluginManager implements PluginManager {
// Akarin start // Akarin start
//defaultPerms.get(true).clear(); //defaultPerms.get(true).clear();
//defaultPerms.get(false).clear(); //defaultPerms.get(false).clear();
defaultPerms = HashIntObjMaps.newImmutableMap(HashObjSets.newImmutableSetOf(0, 1), HashObjSets.newImmutableSetOf(HashObjSets.newMutableSet(), HashObjSets.newMutableSet())); HashObjObjMap<Boolean, Set<Permission>> defaultPerms = HashObjObjMaps.newUpdatableMap();
defaultPerms.put(Boolean.TRUE, HashObjSets.newUpdatableSet());
defaultPerms.put(Boolean.FALSE, HashObjSets.newUpdatableSet());
this.defaultPerms = defaultPerms;
// Akarin end // Akarin end
} }
// Paper end // Paper end