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

Log the name of the calculator when an exception is thrown

Browse Source
This commit is contained in:
Luck
2018-01-23 16:52:50 +00:00
Unverified
parent 0eba5f1cbc
commit 6923c4e247
4 changed files with 63 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sponge/src/main/java/me/lucko/luckperms/sponge/contexts/ProxiedContextCalculator.java → sponge/src/main/java/me/lucko/luckperms/sponge/contexts/SpongeProxiedContextCalculator.java
+10 -4
View File
@@ -25,21 +25,22 @@
package me.lucko.luckperms.sponge.contexts;
import me.lucko.luckperms.api.context.ContextCalculator;
import me.lucko.luckperms.api.context.MutableContextSet;
import me.lucko.luckperms.common.contexts.ProxiedContextCalculator;
import me.lucko.luckperms.sponge.service.context.DelegatingMutableContextSet;
import org.spongepowered.api.service.context.Context;
import org.spongepowered.api.service.context.ContextCalculator;
import org.spongepowered.api.service.permission.Subject;
import java.util.Set;
import javax.annotation.Nonnull;
public class ProxiedContextCalculator implements ContextCalculator<Subject> {
private final org.spongepowered.api.service.context.ContextCalculator<Subject> delegate;
public class SpongeProxiedContextCalculator implements ProxiedContextCalculator<Subject> {
private final ContextCalculator<Subject> delegate;
public ProxiedContextCalculator(org.spongepowered.api.service.context.ContextCalculator<Subject> delegate) {
public SpongeProxiedContextCalculator(ContextCalculator<Subject> delegate) {
this.delegate = delegate;
}
@@ -51,4 +52,9 @@ public class ProxiedContextCalculator implements ContextCalculator<Subject> {
return accumulator;
}
@Override
public Object getDelegate() {
return this.delegate;
}
}
sponge/src/main/java/me/lucko/luckperms/sponge/service/LuckPermsService.java
+4 -3
View File
@@ -34,7 +34,7 @@ import com.google.common.collect.ImmutableSet;
import me.lucko.luckperms.common.model.Group;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.sponge.LPSpongePlugin;
import me.lucko.luckperms.sponge.contexts.ProxiedContextCalculator;
import me.lucko.luckperms.sponge.contexts.SpongeProxiedContextCalculator;
import me.lucko.luckperms.sponge.managers.SpongeGroupManager;
import me.lucko.luckperms.sponge.managers.SpongeUserManager;
import me.lucko.luckperms.sponge.service.legacy.LegacyDataMigrator;
@@ -48,6 +48,7 @@ import me.lucko.luckperms.sponge.service.reference.SubjectReferenceFactory;
import me.lucko.luckperms.sponge.service.storage.SubjectStorage;
import org.spongepowered.api.plugin.PluginContainer;
import org.spongepowered.api.service.context.ContextCalculator;
import org.spongepowered.api.service.permission.PermissionService;
import org.spongepowered.api.service.permission.Subject;
import org.spongepowered.api.text.Text;
@@ -205,9 +206,9 @@ public class LuckPermsService implements LPPermissionService {
}
@Override
public void registerContextCalculator(org.spongepowered.api.service.context.ContextCalculator<Subject> calculator) {
public void registerContextCalculator(ContextCalculator<Subject> calculator) {
Objects.requireNonNull(calculator);
this.plugin.getContextManager().registerCalculator(new ProxiedContextCalculator(calculator));
this.plugin.getContextManager().registerCalculator(new SpongeProxiedContextCalculator(calculator));
}
@Override