worldofcraft/LuckPerms-DBA
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More workarounds to support MassiveCore's modification of attachment permissions via reflection

Browse Source
This commit is contained in:
Luck 2018-05-31 00:51:33 +01:00
parent 644c53a074
commit f4e4f727dd
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
4 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bukkit/src/main/java/me/lucko/luckperms/bukkit/model/dummy/DummyPermissibleBase.java
View File

@ -53,12 +53,12 @@ public class DummyPermissibleBase extends PermissibleBase {
public static void nullFields(PermissibleBase permissibleBase) { public static void nullFields(PermissibleBase permissibleBase) {
try { try {
ATTACHMENTS_FIELD.set(permissibleBase, null); ATTACHMENTS_FIELD.set(permissibleBase, Collections.emptyList());
} catch (Exception e) { } catch (Exception e) {
// ignore // ignore
} }
try { try {
PERMISSIONS_FIELD.set(permissibleBase, null); PERMISSIONS_FIELD.set(permissibleBase, Collections.emptyMap());
} catch (Exception e) { } catch (Exception e) {
// ignore // ignore
} }

18
bukkit/src/main/java/me/lucko/luckperms/bukkit/model/permissible/LPPermissionAttachment.java
View File

@ -110,7 +110,7 @@ public class LPPermissionAttachment extends PermissionAttachment {
public LPPermissionAttachment(LPPermissible permissible, PermissionAttachment source) { public LPPermissionAttachment(LPPermissible permissible, PermissionAttachment source) {
super(DummyPlugin.INSTANCE, null); super(DummyPlugin.INSTANCE, null);
this.permissible = permissible; this.permissible = permissible;
this.owner = null; this.owner = source.getPlugin();
// copy // copy
this.perms.putAll(source.getPermissions()); this.perms.putAll(source.getPermissions());
@ -389,19 +389,29 @@ public class LPPermissionAttachment extends PermissionAttachment {
@Override @Override
public Set<String> keySet() { public Set<String> keySet() {
// just proxy // just proxy
return LPPermissionAttachment.this.perms.keySet(); return Collections.unmodifiableSet(LPPermissionAttachment.this.perms.keySet());
} }
@Override @Override
public Collection<Boolean> values() { public Collection<Boolean> values() {
// just proxy // just proxy
return LPPermissionAttachment.this.perms.values(); return Collections.unmodifiableCollection(LPPermissionAttachment.this.perms.values());
} }
@Override @Override
public Set<Entry<String, Boolean>> entrySet() { public Set<Entry<String, Boolean>> entrySet() {
// just proxy // just proxy
return LPPermissionAttachment.this.perms.entrySet(); return Collections.unmodifiableSet(LPPermissionAttachment.this.perms.entrySet());
}
@Override
public boolean equals(Object obj) {
return obj instanceof Map<?, ?> && LPPermissionAttachment.this.perms.equals(obj);
}
@Override
public int hashCode() {
return LPPermissionAttachment.this.perms.hashCode();
} }
} }
} }

4
nukkit/src/main/java/me/lucko/luckperms/nukkit/model/dummy/DummyPermissibleBase.java
View File

@ -53,12 +53,12 @@ public class DummyPermissibleBase extends PermissibleBase {
public static void nullFields(PermissibleBase permissibleBase) { public static void nullFields(PermissibleBase permissibleBase) {
try { try {
ATTACHMENTS_FIELD.set(permissibleBase, null); ATTACHMENTS_FIELD.set(permissibleBase, Collections.emptyList());
} catch (Exception e) { } catch (Exception e) {
// ignore // ignore
} }
try { try {
PERMISSIONS_FIELD.set(permissibleBase, null); PERMISSIONS_FIELD.set(permissibleBase, Collections.emptyMap());
} catch (Exception e) { } catch (Exception e) {
// ignore // ignore
} }

22
nukkit/src/main/java/me/lucko/luckperms/nukkit/model/permissible/LPPermissionAttachment.java
View File

@ -109,13 +109,13 @@ public class LPPermissionAttachment extends PermissionAttachment {
injectFakeMap(); injectFakeMap();
} }
public LPPermissionAttachment(LPPermissible permissible, PermissionAttachment nukkit) { public LPPermissionAttachment(LPPermissible permissible, PermissionAttachment source) {
super(DummyPlugin.INSTANCE, null); super(DummyPlugin.INSTANCE, null);
this.permissible = permissible; this.permissible = permissible;
this.owner = null; this.owner = source.getPlugin();
// copy // copy
this.perms.putAll(nukkit.getPermissions()); this.perms.putAll(source.getPermissions());
this.source = source; this.source = source;
injectFakeMap(); injectFakeMap();
@ -419,19 +419,29 @@ public class LPPermissionAttachment extends PermissionAttachment {
@Override @Override
public Set<String> keySet() { public Set<String> keySet() {
// just proxy // just proxy
return LPPermissionAttachment.this.perms.keySet(); return Collections.unmodifiableSet(LPPermissionAttachment.this.perms.keySet());
} }
@Override @Override
public Collection<Boolean> values() { public Collection<Boolean> values() {
// just proxy // just proxy
return LPPermissionAttachment.this.perms.values(); return Collections.unmodifiableCollection(LPPermissionAttachment.this.perms.values());
} }
@Override @Override
public Set<Entry<String, Boolean>> entrySet() { public Set<Entry<String, Boolean>> entrySet() {
// just proxy // just proxy
return LPPermissionAttachment.this.perms.entrySet(); return Collections.unmodifiableSet(LPPermissionAttachment.this.perms.entrySet());
}
@Override
public boolean equals(Object obj) {
return obj instanceof Map<?, ?> && LPPermissionAttachment.this.perms.equals(obj);
}
@Override
public int hashCode() {
return LPPermissionAttachment.this.perms.hashCode();
} }
} }
} }