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

Fix illegal cast from LPSubject to SpongeGroup - fixes #126

Browse Source
This commit is contained in:
Luck 2017-01-12 21:19:34 +00:00
parent 2b96b656a9
commit f7bf4416c9
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sponge/src/main/java/me/lucko/luckperms/sponge/service/LuckPermsSubjectData.java
View File

@ -41,7 +41,6 @@ import me.lucko.luckperms.common.core.model.PermissionHolder;
import me.lucko.luckperms.common.core.model.User; import me.lucko.luckperms.common.core.model.User;
import me.lucko.luckperms.exceptions.ObjectAlreadyHasException; import me.lucko.luckperms.exceptions.ObjectAlreadyHasException;
import me.lucko.luckperms.exceptions.ObjectLacksException; import me.lucko.luckperms.exceptions.ObjectLacksException;
import me.lucko.luckperms.sponge.model.SpongeGroup;
import me.lucko.luckperms.sponge.service.base.LPSubject; import me.lucko.luckperms.sponge.service.base.LPSubject;
import me.lucko.luckperms.sponge.service.base.LPSubjectData; import me.lucko.luckperms.sponge.service.base.LPSubjectData;
import me.lucko.luckperms.sponge.service.references.SubjectReference; import me.lucko.luckperms.sponge.service.references.SubjectReference;
@ -244,15 +243,15 @@ public class LuckPermsSubjectData implements LPSubjectData {
public boolean addParent(@NonNull ContextSet contexts, @NonNull SubjectReference subject) { public boolean addParent(@NonNull ContextSet contexts, @NonNull SubjectReference subject) {
try (Timing i = service.getPlugin().getTimings().time(LPTiming.LP_SUBJECT_ADD_PARENT)) { try (Timing i = service.getPlugin().getTimings().time(LPTiming.LP_SUBJECT_ADD_PARENT)) {
if (subject.getCollection().equals(PermissionService.SUBJECTS_GROUP)) { if (subject.getCollection().equals(PermissionService.SUBJECTS_GROUP)) {
SpongeGroup permsSubject = ((SpongeGroup) subject.resolve(service)); LPSubject permsSubject = subject.resolve(service);
try { try {
if (enduring) { if (enduring) {
holder.setPermission(new NodeBuilder("group." + permsSubject.getName()) holder.setPermission(new NodeBuilder("group." + permsSubject.getIdentifier())
.withExtraContext(contexts) .withExtraContext(contexts)
.build()); .build());
} else { } else {
holder.setTransientPermission(new NodeBuilder("group." + permsSubject.getName()) holder.setTransientPermission(new NodeBuilder("group." + permsSubject.getIdentifier())
.withExtraContext(contexts) .withExtraContext(contexts)
.build()); .build());
} }
@ -270,15 +269,15 @@ public class LuckPermsSubjectData implements LPSubjectData {
public boolean removeParent(@NonNull ContextSet contexts, @NonNull SubjectReference subject) { public boolean removeParent(@NonNull ContextSet contexts, @NonNull SubjectReference subject) {
try (Timing i = service.getPlugin().getTimings().time(LPTiming.LP_SUBJECT_REMOVE_PARENT)) { try (Timing i = service.getPlugin().getTimings().time(LPTiming.LP_SUBJECT_REMOVE_PARENT)) {
if (subject.getCollection().equals(PermissionService.SUBJECTS_GROUP)) { if (subject.getCollection().equals(PermissionService.SUBJECTS_GROUP)) {
SpongeGroup permsSubject = ((SpongeGroup) subject.resolve(service)); LPSubject permsSubject = subject.resolve(service);
try { try {
if (enduring) { if (enduring) {
holder.unsetPermission(new NodeBuilder("group." + permsSubject.getName()) holder.unsetPermission(new NodeBuilder("group." + permsSubject.getIdentifier())
.withExtraContext(contexts) .withExtraContext(contexts)
.build()); .build());
} else { } else {
holder.unsetTransientPermission(new NodeBuilder("group." + permsSubject.getName()) holder.unsetTransientPermission(new NodeBuilder("group." + permsSubject.getIdentifier())
.withExtraContext(contexts) .withExtraContext(contexts)
.build()); .build());
} }