From 0c789c815427a8b200e537e9f8825ca0a94c2759 Mon Sep 17 00:00:00 2001 From: Indyuce Date: Mon, 21 Dec 2020 23:36:12 +0100 Subject: [PATCH] Fixed default configs --- .../mmocore/api/droptable/DropTable.java | 10 ++++------ src/main/resources/config.yml | 17 +++++++++-------- src/main/resources/default/gui/player-stats.yml | 4 ++-- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/src/main/java/net/Indyuce/mmocore/api/droptable/DropTable.java b/src/main/java/net/Indyuce/mmocore/api/droptable/DropTable.java index 862a0bc5..2cf15ae9 100644 --- a/src/main/java/net/Indyuce/mmocore/api/droptable/DropTable.java +++ b/src/main/java/net/Indyuce/mmocore/api/droptable/DropTable.java @@ -5,13 +5,13 @@ import java.util.List; import java.util.Set; import java.util.logging.Level; -import net.Indyuce.mmocore.api.droptable.condition.Condition; -import net.Indyuce.mmocore.api.droptable.condition.ConditionInstance; import org.apache.commons.lang.Validate; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.inventory.ItemStack; import net.Indyuce.mmocore.MMOCore; +import net.Indyuce.mmocore.api.droptable.condition.Condition; +import net.Indyuce.mmocore.api.droptable.condition.ConditionInstance; import net.Indyuce.mmocore.api.droptable.dropitem.DropItem; import net.Indyuce.mmocore.api.loot.LootBuilder; import net.mmogroup.mmolib.api.MMOLineConfig; @@ -86,11 +86,9 @@ public class DropTable extends PostLoadObject { } public boolean areConditionsMet(ConditionInstance entity) { - for (Condition condition : this.getConditions()) { - if (!condition.isMet(entity)) { + for (Condition condition : conditions) + if (!condition.isMet(entity)) return false; - } - } return true; } } \ No newline at end of file diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 10c58b6c..61e6e43b 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -26,18 +26,18 @@ mysql: user: mmolover pass: ILoveAria properties: - cachePrepStmts: true - prepStmtCacheSize: 250 - prepStmtCacheSqlLimit: 2048 + cachePrepStmts: true + prepStmtCacheSize: 250 + prepStmtCacheSqlLimit: 2048 # The default values for all playerdata # All new players will start with these values default-playerdata: - level: 1 - class-points: 0 - skill-points: 0 - attribute-points: 0 - attribute-realloc-points: 0 + level: 1 + class-points: 0 + skill-points: 0 + attribute-points: 0 + attribute-realloc-points: 0 # The list of all conditions which must be met for the # BLOCK REGEN and BLOCK RESTRICTIONS to apply. Set to @@ -56,6 +56,7 @@ custom-mine-conditions: protect-custom-mine: false loot-chests: + # Time in seconds it takes for a loot chest to # expire after it was spawned. 600 is 10 minutes. chest-expire-time: 600 diff --git a/src/main/resources/default/gui/player-stats.yml b/src/main/resources/default/gui/player-stats.yml index 0badb31e..8a635c5d 100644 --- a/src/main/resources/default/gui/player-stats.yml +++ b/src/main/resources/default/gui/player-stats.yml @@ -172,8 +172,8 @@ items: - '&7&ogreatly encourages you!' - '' - '&7Party Bonuses ({count}):' - - '&8- +{buff_additional_experience} Experience Earned!' - - '&8- +{buff_health_regeneration} Health Regeneration' + - '&8- +{buff_additional_experience}% Experience Earned!' + - '&8- +{buff_health_regeneration}% Health Regeneration' stats: slots: [15] function: profile