diff --git a/bungee/src/main/java/me/lucko/luckperms/bungee/LPBungeePlugin.java b/bungee/src/main/java/me/lucko/luckperms/bungee/LPBungeePlugin.java index d57df63aa..b83318de4 100644 --- a/bungee/src/main/java/me/lucko/luckperms/bungee/LPBungeePlugin.java +++ b/bungee/src/main/java/me/lucko/luckperms/bungee/LPBungeePlugin.java @@ -33,6 +33,7 @@ import me.lucko.luckperms.api.PlatformType; import me.lucko.luckperms.bungee.calculators.BungeeCalculatorFactory; import me.lucko.luckperms.bungee.contexts.BackendServerCalculator; import me.lucko.luckperms.bungee.contexts.BungeeContextManager; +import me.lucko.luckperms.bungee.contexts.RedisBungeeCalculator; import me.lucko.luckperms.bungee.listeners.BungeeConnectionListener; import me.lucko.luckperms.bungee.listeners.BungeePermissionCheckListener; import me.lucko.luckperms.bungee.messaging.BungeeMessagingFactory; @@ -189,6 +190,10 @@ public class LPBungeePlugin extends Plugin implements LuckPermsPlugin { contextManager.registerCalculator(new BackendServerCalculator(this)); contextManager.registerCalculator(new LuckPermsCalculator<>(getConfiguration()), true); + if (getProxy().getPluginManager().getPlugin("RedisBungee") != null) { + contextManager.registerCalculator(new RedisBungeeCalculator(), true); + } + // register with the LP API apiProvider = new ApiProvider(this); ApiHandler.registerProvider(apiProvider); diff --git a/bungee/src/main/java/me/lucko/luckperms/bungee/contexts/RedisBungeeCalculator.java b/bungee/src/main/java/me/lucko/luckperms/bungee/contexts/RedisBungeeCalculator.java new file mode 100644 index 000000000..17768ecce --- /dev/null +++ b/bungee/src/main/java/me/lucko/luckperms/bungee/contexts/RedisBungeeCalculator.java @@ -0,0 +1,47 @@ +/* + * This file is part of LuckPerms, licensed under the MIT License. + * + * Copyright (c) lucko (Luck) + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package me.lucko.luckperms.bungee.contexts; + +import com.imaginarycode.minecraft.redisbungee.RedisBungee; +import com.imaginarycode.minecraft.redisbungee.RedisBungeeAPI; + +import me.lucko.luckperms.api.context.ContextCalculator; +import me.lucko.luckperms.api.context.MutableContextSet; + +import net.md_5.bungee.api.connection.ProxiedPlayer; + +public class RedisBungeeCalculator implements ContextCalculator { + private static final String PROXY_KEY = "proxy"; + + @Override + public MutableContextSet giveApplicableContext(ProxiedPlayer subject, MutableContextSet accumulator) { + RedisBungeeAPI redisBungee = RedisBungee.getApi(); + if (redisBungee != null) { + accumulator.add(PROXY_KEY, redisBungee.getServerId()); + } + return accumulator; + } +}