Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2025-03-10 22:03:57 +01:00
Code Issues Projects Releases Wiki Activity

Refactor VaultHookManager

Browse Source
This commit is contained in:
Luck 2019-04-22 10:27:29 +01:00
parent 2fd2f4fedb
commit b81e8a40a4
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
3 changed files with 41 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitPlugin.java
View File

@ -218,8 +218,8 @@ public class LPBukkitPlugin extends AbstractLuckPermsPlugin {
try {
if (force || this.bootstrap.getServer().getPluginManager().isPluginEnabled("Vault")) {
this.vaultHookManager = new VaultHookManager();
this.vaultHookManager.hook(this);
this.vaultHookManager = new VaultHookManager(this);
this.vaultHookManager.hook();
getLogger().info("Registered Vault permission & chat hook.");
}
} catch (Exception e) {
@ -323,31 +323,31 @@ public class LPBukkitPlugin extends AbstractLuckPermsPlugin {
// unhook vault
if (this.vaultHookManager != null) {
this.vaultHookManager.unhook(this);
this.vaultHookManager.unhook();
}
}
public void refreshAutoOp(Player player, boolean callerIsSync) {
if (getConfiguration().get(ConfigKeys.AUTO_OP)) {
User user = getUserManager().getIfLoaded(player.getUniqueId());
if (user == null) {
if (callerIsSync) {
player.setOp(false);
} else {
this.bootstrap.getScheduler().executeSync(() -> player.setOp(false));
}
if (!getConfiguration().get(ConfigKeys.AUTO_OP)) {
return;
}
User user = getUserManager().getIfLoaded(player.getUniqueId());
boolean value;
if (user != null) {
Map<String, Boolean> permData = user.getCachedData().getPermissionData(this.contextManager.getApplicableContexts(player)).getImmutableBacking();
boolean value = permData.getOrDefault("luckperms.autoop", false);
value = permData.getOrDefault("luckperms.autoop", false);
} else {
value = false;
}
if (callerIsSync) {
player.setOp(value);
} else {
this.bootstrap.getScheduler().executeSync(() -> player.setOp(value));
}
}
}
private File resolveConfig() {
File configFile = new File(this.bootstrap.getDataFolder(), "config.yml");

14
bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/VaultHookManager.java
View File

@ -37,16 +37,20 @@ import org.bukkit.plugin.ServicesManager;
* Handles hooking with the Vault API
*/
public class VaultHookManager {
private final LPBukkitPlugin plugin;
private LuckPermsVaultChat chat = null;
private LuckPermsVaultPermission permission = null;
public VaultHookManager(LPBukkitPlugin plugin) {
this.plugin = plugin;
}
/**
* Registers the LuckPerms implementation of {@link Permission} and {@link Chat} with
* the service manager.
*
* @param plugin the plugin
*/
public void hook(LPBukkitPlugin plugin) {
public void hook() {
try {
if (this.permission == null) {
this.permission = new LuckPermsVaultPermission(plugin);
@ -67,10 +71,8 @@ public class VaultHookManager {
/**
* Unregisters the LuckPerms Vault hooks, if present.
*
* @param plugin the plugin
*/
public void unhook(LPBukkitPlugin plugin) {
public void unhook() {
final ServicesManager sm = plugin.getBootstrap().getServer().getServicesManager();
if (this.permission != null) {

15
nukkit/src/main/java/me/lucko/luckperms/nukkit/LPNukkitPlugin.java
View File

@ -270,16 +270,21 @@ public class LPNukkitPlugin extends AbstractLuckPermsPlugin {
}
public void refreshAutoOp(Player player) {
if (getConfiguration().get(ConfigKeys.AUTO_OP)) {
User user = getUserManager().getIfLoaded(player.getUniqueId());
if (user == null) {
player.setOp(false);
if (!getConfiguration().get(ConfigKeys.AUTO_OP)) {
return;
}
User user = getUserManager().getIfLoaded(player.getUniqueId());
boolean value;
if (user != null) {
Map<String, Boolean> permData = user.getCachedData().getPermissionData(this.contextManager.getApplicableContexts(player)).getImmutableBacking();
player.setOp(permData.getOrDefault("luckperms.autoop", false));
value = permData.getOrDefault("luckperms.autoop", false);
} else {
value = false;
}
player.setOp(value);
}
private File resolveConfig() {