Upstream/mmocore
1
0
Fork 1
mirror of https://gitlab.com/phoenix-dvpmt/mmocore.git synced 2024-12-27 05:28:25 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed tool perms parenting

Browse Source
This commit is contained in:
Indyuce 2022-01-30 13:17:34 +01:00
parent 77fd7892ef
commit d4f1477bea
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/main/java/net/Indyuce/mmocore/manager/RestrictionManager.java
View File

@ -1,11 +1,13 @@
package net.Indyuce.mmocore.manager; package net.Indyuce.mmocore.manager;
import io.lumine.mythic.lib.UtilityMethods;
import io.lumine.mythic.lib.api.MMOLineConfig; import io.lumine.mythic.lib.api.MMOLineConfig;
import io.lumine.mythic.lib.api.itemtype.ItemType; import io.lumine.mythic.lib.api.itemtype.ItemType;
import io.lumine.mythic.lib.api.util.PostLoadObject; import io.lumine.mythic.lib.api.util.PostLoadObject;
import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.MMOCore;
import net.Indyuce.mmocore.api.ConfigFile; import net.Indyuce.mmocore.api.ConfigFile;
import net.Indyuce.mmocore.api.block.BlockType; import net.Indyuce.mmocore.api.block.BlockType;
import org.apache.commons.lang.Validate;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
@ -44,25 +46,29 @@ public class RestrictionManager implements MMOCoreManager {
try { try {
register(new ToolPermissions(config.getConfigurationSection(key))); register(new ToolPermissions(config.getConfigurationSection(key)));
} catch (IllegalArgumentException exception) { } catch (IllegalArgumentException exception) {
MMOCore.log(Level.WARNING, "Could not load block perms " + key + ": " + exception.getMessage()); MMOCore.log(Level.WARNING, "Could not load perm set '" + key + "': " + exception.getMessage());
} }
for (ToolPermissions perms : map.values()) for (ToolPermissions perms : map.values())
try { try {
perms.postLoad(); perms.postLoad();
} catch (IllegalArgumentException exception) { } catch (IllegalArgumentException exception) {
MMOCore.log(Level.WARNING, "Could not postload block perms " + perms.getTool().display() + ": " + exception.getMessage()); MMOCore.log(Level.WARNING, "Could not post-load perm set '" + perms.getTool().display() + "': " + exception.getMessage());
} }
} }
public void register(ToolPermissions perms) { public void register(ToolPermissions perms) {
map.put(perms.getTool().display(), perms); map.put(perms.getTool().display(), perms);
if (perms.isDefault()) if (perms.isDefault()) {
Validate.isTrue(defaultPermissions == null, "There is already a default tool permission set");
defaultPermissions = perms; defaultPermissions = perms;
} }
}
/** /**
* Uses a hashMap O(1) check to find permission set of given item
*
* @param item The item used to break a block * @param item The item used to break a block
* @return A list of all the blocks an item is allowed to break. * @return A list of all the blocks an item is allowed to break.
* If it was not registered earlier, it returns the default permission * If it was not registered earlier, it returns the default permission
@ -76,19 +82,11 @@ public class RestrictionManager implements MMOCoreManager {
} }
/** /**
* Uses a hashMap O(1) check to determine if the given item
* can break the block
* <p>
* MMOCore looks
*
* @param item The item used to break a block * @param item The item used to break a block
* @return If the block can be broken by a certain item * @return If the block can be broken by a certain item
*/ */
public boolean checkPermissions(ItemStack item, BlockType block) { public boolean checkPermissions(ItemStack item, BlockType block) {
ToolPermissions perms = getPermissions(item);
// Map O(1) checkup instead of linear time
String mapKey = ItemType.fromItemStack(item).display();
ToolPermissions perms = map.getOrDefault(mapKey, defaultPermissions);
return perms != null && perms.canMine(block); return perms != null && perms.canMine(block);
} }
@ -116,15 +114,11 @@ public class RestrictionManager implements MMOCoreManager {
@Override @Override
protected void whenPostLoaded(ConfigurationSection config) { protected void whenPostLoaded(ConfigurationSection config) {
if (config.contains("parent")) if (config.contains("parent"))
parent = map.get(ItemType.fromString(config.getString("parent"))); parent = map.get(UtilityMethods.enumName(config.getString("parent")));
for (String key : config.getStringList("can-mine")) for (String key : config.getStringList("can-mine"))
mineable.add(MMOCore.plugin.loadManager.loadBlockType(new MMOLineConfig(key)).generateKey()); mineable.add(MMOCore.plugin.loadManager.loadBlockType(new MMOLineConfig(key)).generateKey());
} }
public void addPermission(BlockType block) {
mineable.add(block.generateKey());
}
/** /**
* Recursively checks if a player can break the * Recursively checks if a player can break the
* given block by exploring the parent permissions tree. * given block by exploring the parent permissions tree.
@ -136,7 +130,16 @@ public class RestrictionManager implements MMOCoreManager {
* @return If the given block can be broken * @return If the given block can be broken
*/ */
public boolean canMine(BlockType type) { public boolean canMine(BlockType type) {
return mineable.contains(type.generateKey()) || (parent != null && parent.canMine(type)); ToolPermissions parent;
return mineable.contains(type.generateKey()) || ((parent = getParent()) != null && parent.canMine(type));
}
/**
* @return Either parent if provided or default tool permission set if this is
* not the default set already, or null otherwise.
*/
public ToolPermissions getParent() {
return parent != null ? parent : defaultSet ? null : defaultPermissions;
} }
public ItemType getTool() { public ItemType getTool() {