diff --git a/src/main/java/su/nightexpress/quantumrpg/stats/items/attributes/DamageAttribute.java b/src/main/java/su/nightexpress/quantumrpg/stats/items/attributes/DamageAttribute.java index 05aaca08..15d97977 100644 --- a/src/main/java/su/nightexpress/quantumrpg/stats/items/attributes/DamageAttribute.java +++ b/src/main/java/su/nightexpress/quantumrpg/stats/items/attributes/DamageAttribute.java @@ -244,11 +244,10 @@ public String formatValue(@NotNull ItemStack item, @NotNull StatBonus value) { @Override @NotNull public String getFormat(@Nullable Player p, @NotNull ItemStack item, @NotNull StatBonus value) { - String format = super.getFormat(item, value); StatBonus.Condition condition = value.getCondition(); - if (condition == null || !EngineCfg.LORE_STYLE_REQ_USER_DYN_UPDATE) - return StringUT.colorFix(format.replace("%condition%", "")); - return StringUT.colorFix(format.replace("%condition%", condition.getFormat(p, item))); + return StringUT.colorFix(super.getFormat(item, value).replace("%condition%", condition == null || !EngineCfg.LORE_STYLE_REQ_USER_DYN_UPDATE + ? "" + : condition.getFormat(p, item))); } @Override diff --git a/src/main/java/su/nightexpress/quantumrpg/stats/items/attributes/DefenseAttribute.java b/src/main/java/su/nightexpress/quantumrpg/stats/items/attributes/DefenseAttribute.java index 7a7563ed..c18f8f44 100644 --- a/src/main/java/su/nightexpress/quantumrpg/stats/items/attributes/DefenseAttribute.java +++ b/src/main/java/su/nightexpress/quantumrpg/stats/items/attributes/DefenseAttribute.java @@ -166,11 +166,10 @@ public String formatValue(@NotNull ItemStack item, @NotNull StatBonus statBonus) @Override @NotNull public String getFormat(@Nullable Player p, @NotNull ItemStack item, @NotNull StatBonus value) { - String format = super.getFormat(item, value); StatBonus.Condition condition = value.getCondition(); - return StringUT.colorFix(format.replace("%condition%", condition == null || !EngineCfg.LORE_STYLE_REQ_USER_DYN_UPDATE + return StringUT.colorFix(super.getFormat(item, value).replace("%condition%", condition == null || !EngineCfg.LORE_STYLE_REQ_USER_DYN_UPDATE ? "" - : condition.getFormat(p, item).replace("%state%", EngineCfg.getDynamicRequirementState(p != null && value.meetsRequirement(p))))); + : condition.getFormat(p, item))); } @Override diff --git a/src/main/java/su/nightexpress/quantumrpg/stats/items/attributes/api/SimpleStat.java b/src/main/java/su/nightexpress/quantumrpg/stats/items/attributes/api/SimpleStat.java index 204b62ae..23d0e1ab 100644 --- a/src/main/java/su/nightexpress/quantumrpg/stats/items/attributes/api/SimpleStat.java +++ b/src/main/java/su/nightexpress/quantumrpg/stats/items/attributes/api/SimpleStat.java @@ -252,11 +252,10 @@ public ItemStack updateItem(@Nullable Player p, @NotNull ItemStack item) { @Override @NotNull public String getFormat(@Nullable Player p, @NotNull ItemStack item, @NotNull StatBonus value) { - String format = super.getFormat(item, value); StatBonus.Condition condition = value.getCondition(); - return StringUT.colorFix(format.replace("%condition%", condition == null || !EngineCfg.LORE_STYLE_REQ_USER_DYN_UPDATE + return StringUT.colorFix(super.getFormat(item, value).replace("%condition%", condition == null || !EngineCfg.LORE_STYLE_REQ_USER_DYN_UPDATE ? "" - : condition.getFormat(p, item).replace("%state%", EngineCfg.getDynamicRequirementState(p != null && value.meetsRequirement(p))))); + : condition.getFormat(p, item))); } public enum ItemType {