Repo-Mirror/EcoArmor
9
0
Fork 0
mirror of https://github.com/Auxilor/EcoArmor.git synced 2025-12-27 19:09:13 +00:00
Code Issues Releases 1 Activity

Fixed conditions

Browse Source
This commit is contained in:
Auxilor
2021-06-18 11:45:21 +01:00
parent ca347113b6
commit c4213abb2b
2 changed files with 4 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/sets/ArmorSet.java
View File

@@ -126,16 +126,10 @@ public class ArmorSet {
this.plugin = plugin;
this.name = config.getString("name");
for (String definedKey : this.getConfig().getStrings("conditions")) {
String[] split = definedKey.split(":");
String key = split[0].trim();
String value = split[1].trim();
Condition<?> condition = Conditions.getByName(key);
if (condition == null) {
Bukkit.getLogger().warning("Invalid condition specified in " + this.name);
} else {
conditions.put(condition, ArmorUtils.getConditionValue(value, condition));
}
for (JSONConfig cfg : this.getConfig().getSubsections("conditions")) {
Condition<?> effect = Conditions.getByName(cfg.getString("id"));
Object value = cfg.get("args");
conditions.put(effect, value);
}
for (JSONConfig cfg : this.getConfig().getSubsections("effects")) {

26
eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/sets/util/ArmorUtils.java
View File

@@ -401,30 +401,4 @@ public class ArmorUtils {
return ArmorSets.getByName(shardSet);
}
/**
* Get value of condition.
*
* @param string Value as string.
* @param condition Condition.
* @param <T> The type of the condition.
* @return Value.
*/
@NotNull
public static <T> Object getConditionValue(@NotNull final String string,
@NotNull final Condition<T> condition) {
if (condition.getTypeClass().equals(Boolean.class)) {
return Boolean.parseBoolean(string);
}
if (condition.getTypeClass().equals(Integer.class)) {
return Integer.parseInt(string);
}
if (condition.getTypeClass().equals(Double.class)) {
return Double.parseDouble(string);
}
return string;
}
}