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

Implement accumulation of static contexts from a file

Browse Source
This commit is contained in:
Luck
2017-04-03 01:42:49 +01:00
Unverified
parent 2749563f5d
commit 0ec19a8fee
12 changed files with 93 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sponge/src/main/java/me/lucko/luckperms/sponge/LPSpongePlugin.java
+2 -2
View File
@@ -39,7 +39,7 @@ import me.lucko.luckperms.common.config.ConfigKeys;
import me.lucko.luckperms.common.config.LuckPermsConfiguration;
import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.common.contexts.ContextManager;
import me.lucko.luckperms.common.contexts.ServerCalculator;
import me.lucko.luckperms.common.contexts.StaticCalculator;
import me.lucko.luckperms.common.core.UuidCache;
import me.lucko.luckperms.common.core.model.User;
import me.lucko.luckperms.common.dependencies.DependencyManager;
@@ -265,7 +265,7 @@ public class LPSpongePlugin implements LuckPermsPlugin {
cachedStateManager = new CachedStateManager(this);
contextManager = new ContextManager<>();
contextManager.registerCalculator(new ServerCalculator<>(configuration));
contextManager.registerCalculator(new StaticCalculator<>(configuration));
contextManager.registerCalculator(new WorldCalculator());
// register the PermissionService with Sponge
sponge/src/main/java/me/lucko/luckperms/sponge/contexts/SpongeCalculatorLink.java
-7
View File
@@ -32,7 +32,6 @@ import org.spongepowered.api.service.context.Context;
import org.spongepowered.api.service.permission.Subject;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
@AllArgsConstructor
@@ -47,10 +46,4 @@ public class SpongeCalculatorLink implements ContextCalculator<Subject> {
accumulator.addAll(Util.convertContexts(contexts));
return accumulator;
}
@Override
public boolean isContextApplicable(Subject subject, Map.Entry<String, String> context) {
Context c = new Context(context.getKey(), context.getValue());
return calculator.matches(c, subject);
}
}
sponge/src/main/java/me/lucko/luckperms/sponge/contexts/WorldCalculator.java
-13
View File
@@ -32,8 +32,6 @@ import org.spongepowered.api.entity.living.player.Player;
import org.spongepowered.api.service.context.Context;
import org.spongepowered.api.service.permission.Subject;
import java.util.Map;
@RequiredArgsConstructor
public class WorldCalculator implements ContextCalculator<Subject> {
@@ -49,15 +47,4 @@ public class WorldCalculator implements ContextCalculator<Subject> {
return accumulator;
}
@Override
public boolean isContextApplicable(Subject subject, Map.Entry<String, String> context) {
CommandSource source = subject.getCommandSource().orElse(null);
if (source == null || !(source instanceof Player)) {
return false;
}
Player p = ((Player) source);
return context.getKey().equals(Context.WORLD_KEY) && p.getWorld().getName().equals(context.getValue());
}
}