From 0272e20d60fc215f3a29210fb7b0fdb1ef8aeab1 Mon Sep 17 00:00:00 2001 From: CmdrKittens <52665651+CmdrKittens@users.noreply.github.com> Date: Tue, 17 Mar 2020 21:33:48 -0400 Subject: [PATCH] Configurable max amount to test via perms --- .../com/drtshock/playervaults/PlayerVaults.java | 13 +++++++++++-- .../vaultmanagement/VaultOperations.java | 2 +- src/main/resources/config.yml | 2 ++ src/main/resources/plugin.yml | 2 +- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/drtshock/playervaults/PlayerVaults.java b/src/main/java/com/drtshock/playervaults/PlayerVaults.java index a20d51b..281f318 100644 --- a/src/main/java/com/drtshock/playervaults/PlayerVaults.java +++ b/src/main/java/com/drtshock/playervaults/PlayerVaults.java @@ -18,7 +18,11 @@ package com.drtshock.playervaults; -import com.drtshock.playervaults.commands.*; +import com.drtshock.playervaults.commands.ConvertCommand; +import com.drtshock.playervaults.commands.DeleteCommand; +import com.drtshock.playervaults.commands.SignCommand; +import com.drtshock.playervaults.commands.SignSetInfo; +import com.drtshock.playervaults.commands.VaultCommand; import com.drtshock.playervaults.listeners.Listeners; import com.drtshock.playervaults.listeners.SignListener; import com.drtshock.playervaults.listeners.VaultPreloadListener; @@ -40,7 +44,6 @@ import org.bukkit.command.CommandSender; import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.entity.Player; -import org.bukkit.event.inventory.InventoryInteractEvent; import org.bukkit.inventory.Inventory; import org.bukkit.plugin.RegisteredServiceProvider; import org.bukkit.plugin.java.JavaPlugin; @@ -73,6 +76,7 @@ public class PlayerVaults extends JavaPlugin { private File uuidData; private File vaultData; private String _versionString; + private int maxVaultAmountPermTest; public static PlayerVaults getInstance() { return instance; @@ -114,6 +118,7 @@ public class PlayerVaults extends JavaPlugin { getServer().getPluginManager().registerEvents(new SignListener(this), this); debug("registering listeners", System.currentTimeMillis()); this.backupsEnabled = this.getConfig().getBoolean("backups.enabled", true); + this.maxVaultAmountPermTest = this.getConfig().getInt("max-vault-amount-perm-to-test", 99); loadSigns(); debug("loaded signs", System.currentTimeMillis()); debug("check update", System.currentTimeMillis()); @@ -410,4 +415,8 @@ public class PlayerVaults extends JavaPlugin { public boolean isSign(Material mat) { return mat.name().toUpperCase().contains("SIGN"); } + + public int getMaxVaultAmountPermTest() { + return this.maxVaultAmountPermTest; + } } diff --git a/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultOperations.java b/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultOperations.java index 100448e..c39c912 100644 --- a/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultOperations.java +++ b/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultOperations.java @@ -77,7 +77,7 @@ public class VaultOperations { if (sender.hasPermission("playervaults.amount." + number)) { return true; } - for (int x = number; x <= 99; x++) { + for (int x = number; x <= PlayerVaults.getInstance().getMaxVaultAmountPermTest(); x++) { if (sender.hasPermission("playervaults.amount." + x)) { return true; } diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 0d58199..0a066cd 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -52,3 +52,5 @@ cleanup: # Enabling this will create backups of vaults automagically. backups: enabled: true + +max-vault-amount-perm-to-test: 99 \ No newline at end of file diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 757da59..e942ea3 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: PlayerVaults -authors: [drtshock, kashike] +authors: [drtshock, kashike, CmdrKittens] website: ${project.url} version: ${project.version}