From 004a2b8673223bbb660021898f639d23ed2de6f3 Mon Sep 17 00:00:00 2001 From: Ka0rX Date: Sun, 25 Jun 2023 11:14:15 +0100 Subject: [PATCH 1/7] Fixed Issue related to custom sound being case sensitive. --- .../src/main/java/net/Indyuce/mmocore/api/SoundObject.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/SoundObject.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/SoundObject.java index d9e4eba4..da6dfdf6 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/SoundObject.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/SoundObject.java @@ -36,7 +36,7 @@ public class SoundObject { } this.sound = sound; - this.key = key; + this.key = key.toLowerCase(); volume = split.length > 1 ? Float.parseFloat(split[1]) : 1; pitch = split.length > 2 ? Float.parseFloat(split[2]) : 1; @@ -54,7 +54,7 @@ public class SoundObject { } this.sound = sound; - this.key = key; + this.key = key.toLowerCase(); volume = (float) config.getDouble("volume", 1); pitch = (float) config.getDouble("pitch", 1); @@ -62,7 +62,7 @@ public class SoundObject { /** * @return If this object is custom a custom sound, potentially - * from a resource pack + * from a resource pack */ public boolean isCustom() { return sound == null; From 892b04cd3a72e1e87712daf5d261bf063d16e1a1 Mon Sep 17 00:00:00 2001 From: Ka0rX Date: Sun, 25 Jun 2023 11:14:47 +0100 Subject: [PATCH 2/7] Fixed Issue #870 about skill tree triggers being applied 2 times when using force-class. --- .../main/java/net/Indyuce/mmocore/api/player/PlayerData.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java index 668a566d..f2bf4363 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java @@ -1129,8 +1129,6 @@ public class PlayerData extends SynchronizedDataHolder implements OfflinePlayerD boundSkills.forEach((slot, info) -> info.close()); boundSkills.clear(); - //Update skill tree. - setupSkillTree(); // Update stats if (isOnline()) getStats().updateStats(); } From 49b699b54bbb8d2864ac42a7e6b68f9c9b052220 Mon Sep 17 00:00:00 2001 From: Ka0rX Date: Sun, 25 Jun 2023 15:13:04 +0100 Subject: [PATCH 3/7] Added possibility to specify decimal format for each skill parameter regarding issue #866. --- .../net/Indyuce/mmocore/skill/ClassSkill.java | 5 ++++- .../Indyuce/mmocore/skill/RegisteredSkill.java | 15 ++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/skill/ClassSkill.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/skill/ClassSkill.java index 203a10c6..6f8ee174 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/skill/ClassSkill.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/skill/ClassSkill.java @@ -149,7 +149,10 @@ public class ClassSkill implements CooldownObject, Unlockable { // Calculate placeholders Placeholders placeholders = new Placeholders(); - parameters.keySet().forEach(modifier -> placeholders.register(modifier, MythicLib.plugin.getMMOConfig().decimal.format(data.getMMOPlayerData().getSkillModifierMap().getInstance(skill.getHandler(), modifier).getTotal(parameters.get(modifier).calculate(x))))); + parameters.keySet() + .forEach(param -> { + placeholders.register(param, skill.getDecimalFormat(param).format(data.getMMOPlayerData().getSkillModifierMap().getInstance(skill.getHandler(), param).getTotal(parameters.get(param).calculate(x)))); + }); placeholders.register("mana_name", data.getProfess().getManaDisplay().getName()); placeholders.register("mana_color", data.getProfess().getManaDisplay().getFull().toString()); diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/skill/RegisteredSkill.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/skill/RegisteredSkill.java index 2affad11..589b97eb 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/skill/RegisteredSkill.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/skill/RegisteredSkill.java @@ -13,12 +13,16 @@ import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.text.DecimalFormat; import java.util.*; public class RegisteredSkill { private final SkillHandler handler; private final String name; private final Map defaultParameters = new HashMap<>(); + + private final Map parameterDecimalFormats = new HashMap<>(); + private final ItemStack icon; private final List lore; private final List categories; @@ -42,10 +46,15 @@ public class RegisteredSkill { else categories.add("ACTIVE"); + // Load default modifier formulas - for (String param : handler.getParameters()) + for (String param : handler.getParameters()) { + if (config.contains(param + ".decimal-format")) + parameterDecimalFormats.put(param, new DecimalFormat(config.getString(param + ".decimal-format"))); defaultParameters.put(param, config.contains(param) ? new LinearValue(config.getConfigurationSection(param)) : LinearValue.ZERO); + } + /* * This is so that SkillAPI skill level matches the MMOCore skill level * https://gitlab.com/phoenix-dvpmt/mmocore/-/issues/531 @@ -111,6 +120,10 @@ public class RegisteredSkill { defaultParameters.put(parameter, linear); } + public DecimalFormat getDecimalFormat(String parameter) { + return parameterDecimalFormats.getOrDefault(parameter, MythicLib.plugin.getMMOConfig().decimal); + } + @Deprecated public void addModifierIfNone(String mod, LinearValue defaultValue) { From a7af0e1ca733620074b147bc05d78348a0e59e2e Mon Sep 17 00:00:00 2001 From: Ka0rX Date: Sun, 25 Jun 2023 15:13:47 +0100 Subject: [PATCH 4/7] Changed default skill config. --- MMOCore-Dist/src/main/resources/default/skills/ambers.yml | 3 +++ MMOCore-Dist/src/main/resources/default/skills/arcane-hail.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/arcane-rift.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/backstab.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/black-hole.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/blind.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/blink.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/blizzard.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/bloodbath.yml | 2 ++ .../src/main/resources/default/skills/bouncy-fireball.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/bunny-mode.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/burn.yml | 2 ++ .../src/main/resources/default/skills/burning-hands.yml | 2 ++ .../src/main/resources/default/skills/chicken-wraith.yml | 2 ++ .../src/main/resources/default/skills/circular-slash.yml | 2 ++ .../src/main/resources/default/skills/combo-attack.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/confuse.yml | 2 ++ .../src/main/resources/default/skills/contamination.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/control.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/corrosion.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/corrupt.yml | 2 ++ .../src/main/resources/default/skills/corrupted-fangs.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/cursed-beam.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/death-mark.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/deep-wound.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/earthquake.yml | 2 ++ .../src/main/resources/default/skills/empowered-attack.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/evade.yml | 2 ++ .../src/main/resources/default/skills/explosive-turkey.yml | 2 ++ .../src/main/resources/default/skills/fire-berserker.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/fire-meteor.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/fire-rage.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/fire-storm.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/fireball.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/firebolt.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/firefly.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/freeze.yml | 2 ++ .../src/main/resources/default/skills/freezing-curse.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/frog-mode.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/frozen-aura.yml | 2 ++ .../src/main/resources/default/skills/furtive-strike.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/grand-heal.yml | 2 ++ .../src/main/resources/default/skills/greater-healings.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/heal.yml | 2 ++ .../src/main/resources/default/skills/heavy-charge.yml | 2 ++ .../src/main/resources/default/skills/hoearthquake.yml | 2 ++ .../src/main/resources/default/skills/holy-missile.yml | 3 +++ .../src/main/resources/default/skills/human-shield.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/ice-crystal.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/ice-spikes.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/ignite.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/item-bomb.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/item-throw.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/leap.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/life-ender.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/light-dash.yml | 2 ++ .../src/main/resources/default/skills/lightning-beam.yml | 2 ++ .../src/main/resources/default/skills/magical-path.yml | 2 ++ .../src/main/resources/default/skills/magical-shield.yml | 2 ++ .../src/main/resources/default/skills/magma-fissure.yml | 2 ++ .../src/main/resources/default/skills/minor-explosion.yml | 2 ++ .../src/main/resources/default/skills/minor-healings.yml | 2 ++ .../src/main/resources/default/skills/neptune-gift.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/overload.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/poison.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/power-mark.yml | 2 ++ .../src/main/resources/default/skills/present-throw.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/regen-ally.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/shadow-veil.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/shock.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/shockwave.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/sky-smash.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/slow.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/smite.yml | 2 ++ .../src/main/resources/default/skills/sneaky-picky.yml | 2 ++ .../src/main/resources/default/skills/snowman-turret.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/sparkle.yml | 2 ++ .../src/main/resources/default/skills/staff-attack.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/starfall.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/stun.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/swiftness.yml | 2 ++ .../src/main/resources/default/skills/tactical-grenade.yml | 2 ++ .../src/main/resources/default/skills/targeted-fireball.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/telekinesy.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/throw-up.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/thrust.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/tnt-throw.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/vampirism.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/void-zapper.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/warp.yml | 2 ++ .../src/main/resources/default/skills/weaken-target.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/weaken.yml | 2 ++ MMOCore-Dist/src/main/resources/default/skills/wither.yml | 2 ++ 93 files changed, 188 insertions(+) diff --git a/MMOCore-Dist/src/main/resources/default/skills/ambers.yml b/MMOCore-Dist/src/main/resources/default/skills/ambers.yml index 561917bc..1bbfeb9b 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/ambers.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/ambers.yml @@ -12,6 +12,9 @@ mana: per-level: 1.0 max: 0.0 min: 0.0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' + stamina: base: 2.0 per-level: 1.0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/arcane-hail.yml b/MMOCore-Dist/src/main/resources/default/skills/arcane-hail.yml index 2ccb98bb..1223cb94 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/arcane-hail.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/arcane-hail.yml @@ -11,6 +11,8 @@ duration: per-level: 1 min: 0 max: 0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' timer: base: 0 per-level: 0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/arcane-rift.yml b/MMOCore-Dist/src/main/resources/default/skills/arcane-rift.yml index f822c1d0..12858e05 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/arcane-rift.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/arcane-rift.yml @@ -9,6 +9,8 @@ material: BOOK duration: base: 2 per-level: 1 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' timer: base: 0 per-level: 0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/backstab.yml b/MMOCore-Dist/src/main/resources/default/skills/backstab.yml index 95d58ac3..95eeb578 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/backstab.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/backstab.yml @@ -7,6 +7,8 @@ material: FLINT mana: base: 8.0 per-level: 1.0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' stamina: base: 2.0 per-level: 1.0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/black-hole.yml b/MMOCore-Dist/src/main/resources/default/skills/black-hole.yml index df2c4556..ef48d89d 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/black-hole.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/black-hole.yml @@ -11,6 +11,8 @@ material: BLACK_DYE duration: base: 4 per-level: 0.5 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' timer: base: 0 per-level: 0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/blind.yml b/MMOCore-Dist/src/main/resources/default/skills/blind.yml index d33b8f75..af91e642 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/blind.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/blind.yml @@ -9,6 +9,8 @@ material: ENDER_EYE duration: base: 5 per-level: 1 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' timer: base: 0 per-level: 0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/blink.yml b/MMOCore-Dist/src/main/resources/default/skills/blink.yml index 39f9ea83..54629dba 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/blink.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/blink.yml @@ -12,6 +12,8 @@ timer: per-level: 0 min: 0 max: 0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' delay: base: 0 per-level: 0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/blizzard.yml b/MMOCore-Dist/src/main/resources/default/skills/blizzard.yml index 38289db3..e5776837 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/blizzard.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/blizzard.yml @@ -10,6 +10,8 @@ material: SNOWBALL duration: base: 5 per-level: 1 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' timer: base: 0 per-level: 0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/bloodbath.yml b/MMOCore-Dist/src/main/resources/default/skills/bloodbath.yml index ed6f3cdd..a0f92a2c 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/bloodbath.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/bloodbath.yml @@ -8,6 +8,8 @@ material: REDSTONE timer: base: 0 per-level: 0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' amount: base: 2 per-level: 1 diff --git a/MMOCore-Dist/src/main/resources/default/skills/bouncy-fireball.yml b/MMOCore-Dist/src/main/resources/default/skills/bouncy-fireball.yml index 7b080b4a..f85641b4 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/bouncy-fireball.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/bouncy-fireball.yml @@ -10,6 +10,8 @@ material: FIRE_CHARGE timer: base: 2 per-level: 1 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' damage: base: 2 per-level: 1 diff --git a/MMOCore-Dist/src/main/resources/default/skills/bunny-mode.yml b/MMOCore-Dist/src/main/resources/default/skills/bunny-mode.yml index f6129a8e..2b362ee0 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/bunny-mode.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/bunny-mode.yml @@ -9,6 +9,8 @@ material: RABBIT_FOOT duration: base: 6 per-level: 1 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' timer: base: 0 per-level: 0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/burn.yml b/MMOCore-Dist/src/main/resources/default/skills/burn.yml index 7e006a71..19be1628 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/burn.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/burn.yml @@ -8,6 +8,8 @@ material: BOOK duration: base: 4 per-level: 1 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' timer: base: 0 per-level: 0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/burning-hands.yml b/MMOCore-Dist/src/main/resources/default/skills/burning-hands.yml index 05f1593b..d6ec8a01 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/burning-hands.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/burning-hands.yml @@ -10,6 +10,8 @@ material: CAMPFIRE duration: base: 2 per-level: 1 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' timer: base: 0 per-level: 0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/chicken-wraith.yml b/MMOCore-Dist/src/main/resources/default/skills/chicken-wraith.yml index 5ac65b89..e98b240d 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/chicken-wraith.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/chicken-wraith.yml @@ -9,6 +9,8 @@ material: EGG duration: base: 4 per-level: 1 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' timer: base: 0 per-level: 0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/circular-slash.yml b/MMOCore-Dist/src/main/resources/default/skills/circular-slash.yml index 3a877585..28f52670 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/circular-slash.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/circular-slash.yml @@ -11,6 +11,8 @@ timer: per-level: 0 min: 0 max: 0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' damage: base: 2 per-level: 1 diff --git a/MMOCore-Dist/src/main/resources/default/skills/combo-attack.yml b/MMOCore-Dist/src/main/resources/default/skills/combo-attack.yml index c44d5333..d6338ccc 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/combo-attack.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/combo-attack.yml @@ -9,6 +9,8 @@ material: IRON_SWORD damage: base: 9.0 per-level: 1.3 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' mana: base: 10.0 per-level: -0.1 diff --git a/MMOCore-Dist/src/main/resources/default/skills/confuse.yml b/MMOCore-Dist/src/main/resources/default/skills/confuse.yml index 5399b244..72e707a6 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/confuse.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/confuse.yml @@ -11,6 +11,8 @@ timer: per-level: 1 min: 0 max: 0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' delay: base: 0 per-level: 0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/contamination.yml b/MMOCore-Dist/src/main/resources/default/skills/contamination.yml index 5e9b3a41..31e49d29 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/contamination.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/contamination.yml @@ -9,6 +9,8 @@ material: POTION duration: base: 4 per-level: 1 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' timer: base: 0 per-level: 0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/control.yml b/MMOCore-Dist/src/main/resources/default/skills/control.yml index 6b2771d3..3a7575bb 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/control.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/control.yml @@ -11,6 +11,8 @@ material: MAGENTA_DYE duration: base: 2.0 per-level: 1.0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' mana: base: 15.0 per-level: 1.5 diff --git a/MMOCore-Dist/src/main/resources/default/skills/corrosion.yml b/MMOCore-Dist/src/main/resources/default/skills/corrosion.yml index 63113fa6..bf10d568 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/corrosion.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/corrosion.yml @@ -10,6 +10,8 @@ material: LIME_DYE duration: base: 4 per-level: 1 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' timer: base: 2 per-level: 1 diff --git a/MMOCore-Dist/src/main/resources/default/skills/corrupt.yml b/MMOCore-Dist/src/main/resources/default/skills/corrupt.yml index 2483b2d7..de8345be 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/corrupt.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/corrupt.yml @@ -9,6 +9,8 @@ material: BOOK duration: base: 4 per-level: 1 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' timer: base: 2 per-level: 1 diff --git a/MMOCore-Dist/src/main/resources/default/skills/corrupted-fangs.yml b/MMOCore-Dist/src/main/resources/default/skills/corrupted-fangs.yml index 89265dfc..51d10dbc 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/corrupted-fangs.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/corrupted-fangs.yml @@ -12,6 +12,8 @@ timer: per-level: 0 min: 0 max: 0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' damage: base: 2 per-level: 1 diff --git a/MMOCore-Dist/src/main/resources/default/skills/cursed-beam.yml b/MMOCore-Dist/src/main/resources/default/skills/cursed-beam.yml index 1ca13e63..4569982e 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/cursed-beam.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/cursed-beam.yml @@ -10,6 +10,8 @@ material: BOOK duration: base: 3 per-level: 1 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' timer: base: 0 per-level: 0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/death-mark.yml b/MMOCore-Dist/src/main/resources/default/skills/death-mark.yml index 9d121519..499cc9d0 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/death-mark.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/death-mark.yml @@ -8,6 +8,8 @@ material: BOOK duration: base: 5 per-level: 0.5 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' timer: base: 0 per-level: 0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/deep-wound.yml b/MMOCore-Dist/src/main/resources/default/skills/deep-wound.yml index 86777fc3..3b55aca8 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/deep-wound.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/deep-wound.yml @@ -10,6 +10,8 @@ material: REDSTONE damage: base: 5.0 per-level: 1.5 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' mana: base: 8.0 per-level: 3.0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/earthquake.yml b/MMOCore-Dist/src/main/resources/default/skills/earthquake.yml index f9b49324..cb8cf4aa 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/earthquake.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/earthquake.yml @@ -8,6 +8,8 @@ material: BOOK duration: base: 5 per-level: 1 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' timer: base: 0 per-level: 0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/empowered-attack.yml b/MMOCore-Dist/src/main/resources/default/skills/empowered-attack.yml index 7d924914..a6c869a3 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/empowered-attack.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/empowered-attack.yml @@ -11,6 +11,8 @@ material: BONE_MEAL mana: base: 4.0 per-level: 1.0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' stamina: base: 2.0 per-level: 1.0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/evade.yml b/MMOCore-Dist/src/main/resources/default/skills/evade.yml index acac3e3f..213c40ab 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/evade.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/evade.yml @@ -11,6 +11,8 @@ duration: per-level: 1.3 max: 10.0 min: 2.0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' mana: base: 8.0 per-level: 3.0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/explosive-turkey.yml b/MMOCore-Dist/src/main/resources/default/skills/explosive-turkey.yml index 04167b84..e1d505a9 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/explosive-turkey.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/explosive-turkey.yml @@ -10,6 +10,8 @@ material: BOOK duration: base: 4 per-level: 1 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' timer: base: 0 per-level: 0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/fire-berserker.yml b/MMOCore-Dist/src/main/resources/default/skills/fire-berserker.yml index 7658ef43..d78b9c33 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/fire-berserker.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/fire-berserker.yml @@ -7,6 +7,8 @@ mana: per-level: 1.0 max: 0.0 min: 0.0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' stamina: base: 2.0 per-level: 1.0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/fire-meteor.yml b/MMOCore-Dist/src/main/resources/default/skills/fire-meteor.yml index 262fe7fb..36ea0c88 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/fire-meteor.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/fire-meteor.yml @@ -12,6 +12,8 @@ timer: per-level: 0 min: 0 max: 0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' damage: base: 2 per-level: 1 diff --git a/MMOCore-Dist/src/main/resources/default/skills/fire-rage.yml b/MMOCore-Dist/src/main/resources/default/skills/fire-rage.yml index c7e33490..2d6dc794 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/fire-rage.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/fire-rage.yml @@ -11,6 +11,8 @@ material: FIRE_CHARGE duration: base: 8.0 per-level: 1.0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' damage: base: 5.0 per-level: 3.0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/fire-storm.yml b/MMOCore-Dist/src/main/resources/default/skills/fire-storm.yml index 07ff2ffc..4bcf3ad3 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/fire-storm.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/fire-storm.yml @@ -11,6 +11,8 @@ material: BLAZE_POWDER damage: base: 5.0 per-level: 3.0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' ignite: base: 2.0 per-level: 1.1 diff --git a/MMOCore-Dist/src/main/resources/default/skills/fireball.yml b/MMOCore-Dist/src/main/resources/default/skills/fireball.yml index b871ac9e..2fbd5105 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/fireball.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/fireball.yml @@ -14,6 +14,8 @@ material: FIRE_CHARGE damage: base: 5.0 per-level: 3.0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' ignite: base: 2.0 per-level: 1.1 diff --git a/MMOCore-Dist/src/main/resources/default/skills/firebolt.yml b/MMOCore-Dist/src/main/resources/default/skills/firebolt.yml index 0ed82cbd..b7505532 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/firebolt.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/firebolt.yml @@ -12,6 +12,8 @@ timer: per-level: 0 min: 0 max: 0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' damage: base: 3 per-level: 1 diff --git a/MMOCore-Dist/src/main/resources/default/skills/firefly.yml b/MMOCore-Dist/src/main/resources/default/skills/firefly.yml index 0e1b01ff..8c6df2e7 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/firefly.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/firefly.yml @@ -10,6 +10,8 @@ material: FLINT_AND_STEEL duration: base: 5 per-level: 2 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' timer: base: 0 per-level: 0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/freeze.yml b/MMOCore-Dist/src/main/resources/default/skills/freeze.yml index 638e4895..12d9c362 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/freeze.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/freeze.yml @@ -10,6 +10,8 @@ material: SNOWBALL duration: base: 5 per-level: 2 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' timer: base: 0 per-level: 0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/freezing-curse.yml b/MMOCore-Dist/src/main/resources/default/skills/freezing-curse.yml index 745f22d5..5c093c40 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/freezing-curse.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/freezing-curse.yml @@ -10,6 +10,8 @@ material: SNOWBALL duration: base: 3 per-level: 2 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' timer: base: 0 per-level: 0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/frog-mode.yml b/MMOCore-Dist/src/main/resources/default/skills/frog-mode.yml index 245f8611..0433efc7 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/frog-mode.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/frog-mode.yml @@ -11,6 +11,8 @@ material: BOOK duration: base: 10 per-level: 1 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' timer: base: 2 per-level: 1 diff --git a/MMOCore-Dist/src/main/resources/default/skills/frozen-aura.yml b/MMOCore-Dist/src/main/resources/default/skills/frozen-aura.yml index e9033f4c..68f8a916 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/frozen-aura.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/frozen-aura.yml @@ -10,6 +10,8 @@ material: BOOK duration: base: 10 per-level: 1 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' timer: base: 0 per-level: 0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/furtive-strike.yml b/MMOCore-Dist/src/main/resources/default/skills/furtive-strike.yml index 9dcf10bb..687b5c79 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/furtive-strike.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/furtive-strike.yml @@ -9,6 +9,8 @@ material: COAL damage: base: 5.0 per-level: 1.5 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' mana: base: 8.0 per-level: 3.0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/grand-heal.yml b/MMOCore-Dist/src/main/resources/default/skills/grand-heal.yml index ae69c3c6..5aa524b0 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/grand-heal.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/grand-heal.yml @@ -11,6 +11,8 @@ timer: per-level: 0 min: 0 max: 0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' delay: base: 2 per-level: 1 diff --git a/MMOCore-Dist/src/main/resources/default/skills/greater-healings.yml b/MMOCore-Dist/src/main/resources/default/skills/greater-healings.yml index 462f36a9..40b91209 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/greater-healings.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/greater-healings.yml @@ -9,6 +9,8 @@ material: GOLDEN_APPLE mana: base: 4.0 per-level: 2.0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' stamina: base: 2.0 per-level: 1.0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/heal.yml b/MMOCore-Dist/src/main/resources/default/skills/heal.yml index 23a22bd0..015259ac 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/heal.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/heal.yml @@ -11,6 +11,8 @@ timer: per-level: 0 min: 0 max: 0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' delay: base: 2 per-level: 0.1 diff --git a/MMOCore-Dist/src/main/resources/default/skills/heavy-charge.yml b/MMOCore-Dist/src/main/resources/default/skills/heavy-charge.yml index 874a909c..1ca62e45 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/heavy-charge.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/heavy-charge.yml @@ -12,6 +12,8 @@ timer: per-level: 0 min: 0 max: 0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' damage: base: 5 per-level: 0.3 diff --git a/MMOCore-Dist/src/main/resources/default/skills/hoearthquake.yml b/MMOCore-Dist/src/main/resources/default/skills/hoearthquake.yml index d382d8b9..3a313553 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/hoearthquake.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/hoearthquake.yml @@ -13,6 +13,8 @@ timer: per-level: 0 min: 0 max: 0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' delay: base: 2 per-level: 1 diff --git a/MMOCore-Dist/src/main/resources/default/skills/holy-missile.yml b/MMOCore-Dist/src/main/resources/default/skills/holy-missile.yml index 9f23aec8..d9b46395 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/holy-missile.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/holy-missile.yml @@ -10,11 +10,14 @@ material: BOOK duration: base: 4 per-level: 3 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' timer: base: 0 per-level: 0 min: 0 max: 0 + damage: base: 3 per-level: 0.5 diff --git a/MMOCore-Dist/src/main/resources/default/skills/human-shield.yml b/MMOCore-Dist/src/main/resources/default/skills/human-shield.yml index 19418a43..3fdc198d 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/human-shield.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/human-shield.yml @@ -14,6 +14,8 @@ redirect: per-level: -2.0 max: 30.0 min: 20.0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' duration: base: 7.0 per-level: 1.0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/ice-crystal.yml b/MMOCore-Dist/src/main/resources/default/skills/ice-crystal.yml index 5a698d39..8d2e7d1f 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/ice-crystal.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/ice-crystal.yml @@ -10,6 +10,8 @@ material: BOOK duration: base: 4 per-level: 1 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' timer: base: 0 per-level: 0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/ice-spikes.yml b/MMOCore-Dist/src/main/resources/default/skills/ice-spikes.yml index d4fb3484..da5ec5b7 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/ice-spikes.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/ice-spikes.yml @@ -11,6 +11,8 @@ material: SNOWBALL damage: base: 3.0 per-level: 1.0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' mana: base: 20.0 per-level: 2.0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/ignite.yml b/MMOCore-Dist/src/main/resources/default/skills/ignite.yml index dc55fe0b..beb12919 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/ignite.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/ignite.yml @@ -10,6 +10,8 @@ material: BOOK duration: base: 2 per-level: 1 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' timer: base: 0 per-level: 0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/item-bomb.yml b/MMOCore-Dist/src/main/resources/default/skills/item-bomb.yml index c6de7f30..a9215371 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/item-bomb.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/item-bomb.yml @@ -12,6 +12,8 @@ timer: per-level: 0 min: 0 max: 0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' damage: base: 2 per-level: 1 diff --git a/MMOCore-Dist/src/main/resources/default/skills/item-throw.yml b/MMOCore-Dist/src/main/resources/default/skills/item-throw.yml index 245a1a40..5286912c 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/item-throw.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/item-throw.yml @@ -12,6 +12,8 @@ timer: per-level: 0 min: 0 max: 0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' damage: base: 4 per-level: 1.1 diff --git a/MMOCore-Dist/src/main/resources/default/skills/leap.yml b/MMOCore-Dist/src/main/resources/default/skills/leap.yml index f5805556..8ca44524 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/leap.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/leap.yml @@ -12,6 +12,8 @@ timer: per-level: 0 min: 0 max: 0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' delay: base: 0 per-level: 0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/life-ender.yml b/MMOCore-Dist/src/main/resources/default/skills/life-ender.yml index 15151da6..ae2c9a71 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/life-ender.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/life-ender.yml @@ -12,6 +12,8 @@ timer: per-level: 0 min: 0 max: 0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' damage: base: 2 per-level: 1 diff --git a/MMOCore-Dist/src/main/resources/default/skills/light-dash.yml b/MMOCore-Dist/src/main/resources/default/skills/light-dash.yml index 4c5a82c1..fc6e67d6 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/light-dash.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/light-dash.yml @@ -13,6 +13,8 @@ timer: per-level: 0 min: 0 max: 0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' damage: base: 6 per-level: 0.3 diff --git a/MMOCore-Dist/src/main/resources/default/skills/lightning-beam.yml b/MMOCore-Dist/src/main/resources/default/skills/lightning-beam.yml index 6091c74e..74caa85f 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/lightning-beam.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/lightning-beam.yml @@ -12,6 +12,8 @@ timer: per-level: 0 min: 0 max: 0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' damage: base: 3 per-level: 0.5 diff --git a/MMOCore-Dist/src/main/resources/default/skills/magical-path.yml b/MMOCore-Dist/src/main/resources/default/skills/magical-path.yml index d3d41e6a..d4cefa38 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/magical-path.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/magical-path.yml @@ -10,6 +10,8 @@ material: BOOK duration: base: 5 per-level: 0.5 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' timer: base: 0 per-level: 0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/magical-shield.yml b/MMOCore-Dist/src/main/resources/default/skills/magical-shield.yml index d90d16e5..7c337b72 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/magical-shield.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/magical-shield.yml @@ -9,6 +9,8 @@ material: BOOK duration: base: 10 per-level: 3 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' timer: base: 0 per-level: 0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/magma-fissure.yml b/MMOCore-Dist/src/main/resources/default/skills/magma-fissure.yml index 6731ae39..921087e0 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/magma-fissure.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/magma-fissure.yml @@ -11,6 +11,8 @@ timer: per-level: 0 min: 0 max: 0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' ignite: base: 3 per-level: 0.3 diff --git a/MMOCore-Dist/src/main/resources/default/skills/minor-explosion.yml b/MMOCore-Dist/src/main/resources/default/skills/minor-explosion.yml index 6ccea1d7..c68ff0da 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/minor-explosion.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/minor-explosion.yml @@ -11,6 +11,8 @@ timer: per-level: 0 min: 0 max: 0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' damage: base: 3 per-level: 0.1 diff --git a/MMOCore-Dist/src/main/resources/default/skills/minor-healings.yml b/MMOCore-Dist/src/main/resources/default/skills/minor-healings.yml index 37426698..076bc93e 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/minor-healings.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/minor-healings.yml @@ -9,6 +9,8 @@ material: GOLDEN_APPLE mana: base: 4.0 per-level: 2.0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' stamina: base: 2.0 per-level: 1.0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/neptune-gift.yml b/MMOCore-Dist/src/main/resources/default/skills/neptune-gift.yml index e664b23b..f256da49 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/neptune-gift.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/neptune-gift.yml @@ -5,3 +5,5 @@ material: LILY_PAD extra: base: 30.0 per-level: 5.0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' diff --git a/MMOCore-Dist/src/main/resources/default/skills/overload.yml b/MMOCore-Dist/src/main/resources/default/skills/overload.yml index 6ba15025..1b9b61e8 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/overload.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/overload.yml @@ -15,6 +15,8 @@ timer: per-level: 0 min: 0 max: 0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' damage: base: 6 per-level: 1.2 diff --git a/MMOCore-Dist/src/main/resources/default/skills/poison.yml b/MMOCore-Dist/src/main/resources/default/skills/poison.yml index cf2b5e12..d6d007ca 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/poison.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/poison.yml @@ -11,6 +11,8 @@ material: BOOK duration: base: 10 per-level: 0.3 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' timer: base: 0 per-level: 0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/power-mark.yml b/MMOCore-Dist/src/main/resources/default/skills/power-mark.yml index 73cc6cb7..c37323d5 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/power-mark.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/power-mark.yml @@ -17,6 +17,8 @@ material: WITHER_SKELETON_SKULL duration: base: 10.0 per-level: 1.1 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' mana: base: 2.0 per-level: 1.0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/present-throw.yml b/MMOCore-Dist/src/main/resources/default/skills/present-throw.yml index 6427d219..43598552 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/present-throw.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/present-throw.yml @@ -11,6 +11,8 @@ timer: per-level: 0 min: 0 max: 0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' damage: base: 4 per-level: 0.5 diff --git a/MMOCore-Dist/src/main/resources/default/skills/regen-ally.yml b/MMOCore-Dist/src/main/resources/default/skills/regen-ally.yml index b39d893b..fc184715 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/regen-ally.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/regen-ally.yml @@ -10,6 +10,8 @@ material: BOOK duration: base: 5 per-level: 1 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' timer: base: 0 per-level: 0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/shadow-veil.yml b/MMOCore-Dist/src/main/resources/default/skills/shadow-veil.yml index 09c71882..cafbece8 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/shadow-veil.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/shadow-veil.yml @@ -9,6 +9,8 @@ material: BOOK duration: base: 10 per-level: 1 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' timer: base: 0 per-level: 0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/shock.yml b/MMOCore-Dist/src/main/resources/default/skills/shock.yml index 0bd95618..dd230761 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/shock.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/shock.yml @@ -10,6 +10,8 @@ material: BOOK duration: base: 6 per-level: 1.3 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' timer: base: 0 per-level: 0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/shockwave.yml b/MMOCore-Dist/src/main/resources/default/skills/shockwave.yml index 81db976b..bff2ed53 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/shockwave.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/shockwave.yml @@ -12,6 +12,8 @@ timer: per-level: 0 min: 0 max: 0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' delay: base: 0 per-level: 0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/sky-smash.yml b/MMOCore-Dist/src/main/resources/default/skills/sky-smash.yml index f8c6d70a..3f9ef5ff 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/sky-smash.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/sky-smash.yml @@ -12,6 +12,8 @@ timer: per-level: 0 min: 0 max: 0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' damage: base: 4 per-level: 1.5 diff --git a/MMOCore-Dist/src/main/resources/default/skills/slow.yml b/MMOCore-Dist/src/main/resources/default/skills/slow.yml index ee7b48f1..827ef6bb 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/slow.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/slow.yml @@ -13,6 +13,8 @@ duration: per-level: -0.5 min: 0 max: 0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' timer: base: 0 per-level: 0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/smite.yml b/MMOCore-Dist/src/main/resources/default/skills/smite.yml index d649cc10..4ff2df0f 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/smite.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/smite.yml @@ -12,6 +12,8 @@ timer: per-level: 0 min: 0 max: 0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' damage: base: 4 per-level: 1.1 diff --git a/MMOCore-Dist/src/main/resources/default/skills/sneaky-picky.yml b/MMOCore-Dist/src/main/resources/default/skills/sneaky-picky.yml index 07b00614..aed1b908 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/sneaky-picky.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/sneaky-picky.yml @@ -8,6 +8,8 @@ material: DIAMOND_SWORD mana: base: 8.0 per-level: 1.0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' stamina: base: 2.0 per-level: 1.0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/snowman-turret.yml b/MMOCore-Dist/src/main/resources/default/skills/snowman-turret.yml index 2a3fc7bf..3ee81b2c 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/snowman-turret.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/snowman-turret.yml @@ -12,6 +12,8 @@ material: BOOK duration: base: 6 per-level: 0.5 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' timer: base: 0 per-level: 0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/sparkle.yml b/MMOCore-Dist/src/main/resources/default/skills/sparkle.yml index 57fd9000..f2d31247 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/sparkle.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/sparkle.yml @@ -12,6 +12,8 @@ timer: per-level: 0 min: 0 max: 0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' damage: base: 4 per-level: 0.5 diff --git a/MMOCore-Dist/src/main/resources/default/skills/staff-attack.yml b/MMOCore-Dist/src/main/resources/default/skills/staff-attack.yml index 629fa0c4..2bbe3662 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/staff-attack.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/staff-attack.yml @@ -12,6 +12,8 @@ timer: per-level: 0 min: 0 max: 0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' delay: base: 0 per-level: 0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/starfall.yml b/MMOCore-Dist/src/main/resources/default/skills/starfall.yml index 68e6c772..2dbab188 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/starfall.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/starfall.yml @@ -12,6 +12,8 @@ timer: per-level: 0 min: 0 max: 0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' damage: base: 4.2 per-level: 1.1 diff --git a/MMOCore-Dist/src/main/resources/default/skills/stun.yml b/MMOCore-Dist/src/main/resources/default/skills/stun.yml index 7e5b4f84..b638163a 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/stun.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/stun.yml @@ -10,6 +10,8 @@ material: BOOK duration: base: 6 per-level: 0.2 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' timer: base: 0 per-level: 0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/swiftness.yml b/MMOCore-Dist/src/main/resources/default/skills/swiftness.yml index c3ecbe93..7c9c2357 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/swiftness.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/swiftness.yml @@ -10,6 +10,8 @@ material: BOOK duration: base: 10 per-level: 0.5 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' timer: base: 0 per-level: 0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/tactical-grenade.yml b/MMOCore-Dist/src/main/resources/default/skills/tactical-grenade.yml index 2e64ac6d..eceb5ab6 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/tactical-grenade.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/tactical-grenade.yml @@ -10,6 +10,8 @@ material: BOOK timer: base: 0 per-level: 0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' damage: base: 4 per-level: 0.5 diff --git a/MMOCore-Dist/src/main/resources/default/skills/targeted-fireball.yml b/MMOCore-Dist/src/main/resources/default/skills/targeted-fireball.yml index 689781f6..4beb107c 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/targeted-fireball.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/targeted-fireball.yml @@ -13,6 +13,8 @@ timer: per-level: 0 min: 0 max: 0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' ignite: base: 3 per-level: 0.5 diff --git a/MMOCore-Dist/src/main/resources/default/skills/telekinesy.yml b/MMOCore-Dist/src/main/resources/default/skills/telekinesy.yml index a5ca5a07..856ff981 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/telekinesy.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/telekinesy.yml @@ -12,6 +12,8 @@ duration: per-level: 1.1 max: 6.0 min: 3.0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' mana: base: 20.0 per-level: 2.0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/throw-up.yml b/MMOCore-Dist/src/main/resources/default/skills/throw-up.yml index 32723a89..93254e6e 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/throw-up.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/throw-up.yml @@ -10,6 +10,8 @@ material: BOOK duration: base: 3 per-level: 1.1 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' timer: base: 0 per-level: 0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/thrust.yml b/MMOCore-Dist/src/main/resources/default/skills/thrust.yml index 120e13ad..baead86f 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/thrust.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/thrust.yml @@ -12,6 +12,8 @@ timer: per-level: 0 min: 0 max: 0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' damage: base: 6 per-level: 0.3 diff --git a/MMOCore-Dist/src/main/resources/default/skills/tnt-throw.yml b/MMOCore-Dist/src/main/resources/default/skills/tnt-throw.yml index 777fded9..e5b43c3c 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/tnt-throw.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/tnt-throw.yml @@ -13,6 +13,8 @@ timer: per-level: 0 min: 0 max: 0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' delay: base: 0 per-level: 0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/vampirism.yml b/MMOCore-Dist/src/main/resources/default/skills/vampirism.yml index 2ef352a3..270abbbd 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/vampirism.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/vampirism.yml @@ -10,6 +10,8 @@ material: BOOK timer: base: 2 per-level: 1 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' delay: base: 2 per-level: 1 diff --git a/MMOCore-Dist/src/main/resources/default/skills/void-zapper.yml b/MMOCore-Dist/src/main/resources/default/skills/void-zapper.yml index 511b9da5..df2cd6fb 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/void-zapper.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/void-zapper.yml @@ -11,6 +11,8 @@ material: BOOK timer: base: 0 per-level: 0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' damage: base: 6 per-level: 0.5 diff --git a/MMOCore-Dist/src/main/resources/default/skills/warp.yml b/MMOCore-Dist/src/main/resources/default/skills/warp.yml index 358f5629..f24f5b14 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/warp.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/warp.yml @@ -9,6 +9,8 @@ material: ENDER_PEARL mana: base: 8.0 per-level: 3.0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' stamina: base: 2.0 per-level: 1.0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/weaken-target.yml b/MMOCore-Dist/src/main/resources/default/skills/weaken-target.yml index bd78d97e..14f681b5 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/weaken-target.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/weaken-target.yml @@ -9,6 +9,8 @@ material: BOOK duration: base: 5 per-level: 0.5 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' timer: base: 0 per-level: 0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/weaken.yml b/MMOCore-Dist/src/main/resources/default/skills/weaken.yml index 9835bfc1..4d49e469 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/weaken.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/weaken.yml @@ -12,6 +12,8 @@ duration: per-level: -0.1 max: 10.0 min: 5.0 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' mana: base: 4.0 per-level: 1.0 diff --git a/MMOCore-Dist/src/main/resources/default/skills/wither.yml b/MMOCore-Dist/src/main/resources/default/skills/wither.yml index 8b1188fa..fd0b946a 100644 --- a/MMOCore-Dist/src/main/resources/default/skills/wither.yml +++ b/MMOCore-Dist/src/main/resources/default/skills/wither.yml @@ -9,6 +9,8 @@ material: BOOK duration: base: 6 per-level: 0.5 + #Optional: The decimal format used for this skill parameter. + decimal-format: '0.#' timer: base: 0 per-level: 0 From 59ad3259cc171d4e3a655d8cdda8a01bedf41770 Mon Sep 17 00:00:00 2001 From: Ka0rX Date: Sun, 25 Jun 2023 21:41:05 +0100 Subject: [PATCH 5/7] Fixed issue #869 about health not syncing between servers. --- .../Indyuce/mmocore/api/player/PlayerData.java | 4 ++-- .../mmocore/api/quest/ObjectiveProgress.java | 7 +++---- .../Indyuce/mmocore/api/quest/PlayerQuests.java | 4 ++-- .../net/Indyuce/mmocore/api/util/Closable.java | 15 --------------- .../manager/data/sql/MMOCoreDataSynchronizer.java | 4 +--- .../net/Indyuce/mmocore/player/CombatHandler.java | 4 ++-- .../mmocore/skill/binding/BoundSkillInfo.java | 4 ++-- 7 files changed, 12 insertions(+), 30 deletions(-) delete mode 100644 MMOCore-API/src/main/java/net/Indyuce/mmocore/api/util/Closable.java diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java index f2bf4363..1375e555 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java @@ -6,6 +6,7 @@ import io.lumine.mythic.lib.api.stat.StatInstance; import io.lumine.mythic.lib.api.stat.modifier.StatModifier; import io.lumine.mythic.lib.data.SynchronizedDataHolder; import io.lumine.mythic.lib.player.cooldown.CooldownMap; +import io.lumine.mythic.lib.util.Closeable; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.ConfigMessage; import net.Indyuce.mmocore.api.SoundEvent; @@ -25,7 +26,6 @@ import net.Indyuce.mmocore.api.player.stats.PlayerStats; import net.Indyuce.mmocore.api.quest.PlayerQuests; import net.Indyuce.mmocore.api.quest.trigger.StatTrigger; import net.Indyuce.mmocore.api.quest.trigger.Trigger; -import net.Indyuce.mmocore.api.util.Closable; import net.Indyuce.mmocore.api.util.MMOCoreUtils; import net.Indyuce.mmocore.experience.EXPSource; import net.Indyuce.mmocore.experience.ExperienceObject; @@ -69,7 +69,7 @@ import java.util.*; import java.util.logging.Level; import java.util.stream.Collectors; -public class PlayerData extends SynchronizedDataHolder implements OfflinePlayerData, Closable, ExperienceTableClaimer, ClassDataContainer { +public class PlayerData extends SynchronizedDataHolder implements OfflinePlayerData, Closeable, ExperienceTableClaimer, ClassDataContainer { /** * Can be null, the {@link #getProfess()} method will return the diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/quest/ObjectiveProgress.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/quest/ObjectiveProgress.java index a94c4f68..f55c0658 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/quest/ObjectiveProgress.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/quest/ObjectiveProgress.java @@ -1,15 +1,14 @@ package net.Indyuce.mmocore.api.quest; +import io.lumine.mythic.lib.util.Closeable; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.player.PlayerData; -import net.Indyuce.mmocore.api.util.Closable; +import net.Indyuce.mmocore.api.quest.objective.Objective; import org.bukkit.Bukkit; import org.bukkit.event.HandlerList; import org.bukkit.event.Listener; -import net.Indyuce.mmocore.api.quest.objective.Objective; - -public abstract class ObjectiveProgress implements Closable { +public abstract class ObjectiveProgress implements Closeable { private final Objective objective; private final QuestProgress questProgress; diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/quest/PlayerQuests.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/quest/PlayerQuests.java index 6e866a80..5ebece1d 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/quest/PlayerQuests.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/quest/PlayerQuests.java @@ -3,9 +3,9 @@ package net.Indyuce.mmocore.api.quest; import com.google.gson.Gson; import com.google.gson.JsonElement; import com.google.gson.JsonObject; +import io.lumine.mythic.lib.util.Closeable; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.player.PlayerData; -import net.Indyuce.mmocore.api.util.Closable; import org.bukkit.Bukkit; import org.bukkit.NamespacedKey; import org.bukkit.boss.BarColor; @@ -21,7 +21,7 @@ import java.util.Map.Entry; import java.util.Set; import java.util.logging.Level; -public class PlayerQuests implements Closable { +public class PlayerQuests implements Closeable { private final PlayerData playerData; private final Map finished = new HashMap<>(); diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/util/Closable.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/util/Closable.java deleted file mode 100644 index 4b5283f3..00000000 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/util/Closable.java +++ /dev/null @@ -1,15 +0,0 @@ -package net.Indyuce.mmocore.api.util; - -/** - * Indicates that a class temporarily registers something - * such as a Bukkit event, which needs to be unregistered - * when the class is finally garbage collected. - */ -public interface Closable { - - /** - * Method that must be called before the class - * is garbage collected - */ - void close(); -} diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/sql/MMOCoreDataSynchronizer.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/sql/MMOCoreDataSynchronizer.java index c8622051..8a2f1dc2 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/sql/MMOCoreDataSynchronizer.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/sql/MMOCoreDataSynchronizer.java @@ -123,13 +123,11 @@ public class MMOCoreDataSynchronizer extends SQLDataSynchronizer { * These should be loaded after to make sure that the * MAX_MANA, MAX_STAMINA & MAX_STELLIUM stats are already loaded. */ - getData().setHealth(result.getDouble("health")); + double health = result.getDouble("health"); getData().setMana(result.getDouble("mana")); getData().setStamina(result.getDouble("stamina")); getData().setStellium(result.getDouble("stellium")); - if (getData().isOnline()) { - double health = getData().getHealth(); health = health == 0 ? getData().getPlayer().getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue() : health; health = Math.max(Math.min(health, getData().getPlayer().getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue()), 0); getData().getPlayer().setHealth(health); diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/player/CombatHandler.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/player/CombatHandler.java index dfe24ed6..5f4ce07b 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/player/CombatHandler.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/player/CombatHandler.java @@ -1,16 +1,16 @@ package net.Indyuce.mmocore.player; +import io.lumine.mythic.lib.util.Closeable; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.event.PlayerCombatEvent; import net.Indyuce.mmocore.api.player.PlayerData; -import net.Indyuce.mmocore.api.util.Closable; import net.Indyuce.mmocore.command.PvpModeCommand; import org.apache.commons.lang.Validate; import org.bukkit.Bukkit; import org.bukkit.scheduler.BukkitTask; import org.jetbrains.annotations.Nullable; -public class CombatHandler implements Closable { +public class CombatHandler implements Closeable { private final PlayerData player; private long lastEntry = System.currentTimeMillis(), lastHit = System.currentTimeMillis(), invulnerableTill; diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/skill/binding/BoundSkillInfo.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/skill/binding/BoundSkillInfo.java index 4d27d56b..e21e250a 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/skill/binding/BoundSkillInfo.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/skill/binding/BoundSkillInfo.java @@ -1,15 +1,15 @@ package net.Indyuce.mmocore.skill.binding; import io.lumine.mythic.lib.player.skill.PassiveSkill; +import io.lumine.mythic.lib.util.Closeable; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.quest.trigger.SkillModifierTrigger; -import net.Indyuce.mmocore.api.util.Closable; import net.Indyuce.mmocore.skill.ClassSkill; import org.apache.commons.lang.Validate; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -public class BoundSkillInfo implements Closable { +public class BoundSkillInfo implements Closeable { private final SkillSlot skillSlot; private final PlayerData playerData; private final ClassSkill classSkill; From 3f0ca4856ed6038a041648b05ce34dcd2b7fe9e5 Mon Sep 17 00:00:00 2001 From: Ka0rX Date: Sun, 25 Jun 2023 22:15:45 +0100 Subject: [PATCH 6/7] Fixed issue #828 about a bug when dying and then logging out. --- .../mmocore/manager/data/sql/MMOCoreDataSynchronizer.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/sql/MMOCoreDataSynchronizer.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/sql/MMOCoreDataSynchronizer.java index 8a2f1dc2..264666a1 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/sql/MMOCoreDataSynchronizer.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/sql/MMOCoreDataSynchronizer.java @@ -128,7 +128,9 @@ public class MMOCoreDataSynchronizer extends SQLDataSynchronizer { getData().setStamina(result.getDouble("stamina")); getData().setStellium(result.getDouble("stellium")); if (getData().isOnline()) { - health = health == 0 ? getData().getPlayer().getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue() : health; + //If the player is not dead and the health is 0, this means that the data was + //missing from the data base and it gives full health to the player. + health = health == 0 && !getData().getPlayer().isDead() ? getData().getPlayer().getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue() : health; health = Math.max(Math.min(health, getData().getPlayer().getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue()), 0); getData().getPlayer().setHealth(health); } From 4a45f7abb3d5943cd0a96ffbcc00891cfbe63372 Mon Sep 17 00:00:00 2001 From: Ka0rX Date: Sun, 25 Jun 2023 22:18:16 +0100 Subject: [PATCH 7/7] Fixed issue #880 related to a casting issue. --- .../src/main/java/net/Indyuce/mmocore/api/SoundObject.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/SoundObject.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/SoundObject.java index da6dfdf6..6a1d059e 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/SoundObject.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/SoundObject.java @@ -36,7 +36,8 @@ public class SoundObject { } this.sound = sound; - this.key = key.toLowerCase(); + this.key = key != null ? key.toLowerCase() : null; + volume = split.length > 1 ? Float.parseFloat(split[1]) : 1; pitch = split.length > 2 ? Float.parseFloat(split[2]) : 1; @@ -54,7 +55,7 @@ public class SoundObject { } this.sound = sound; - this.key = key.toLowerCase(); + this.key = key != null ? key.toLowerCase() : null; volume = (float) config.getDouble("volume", 1); pitch = (float) config.getDouble("pitch", 1);