From b29dffc912b7b733611a3187c5c8ac8f85bb5a03 Mon Sep 17 00:00:00 2001 From: songoda Date: Thu, 16 Jan 2020 21:42:23 -0500 Subject: [PATCH 1/2] Another attempt at fixing the health mechanic. --- .../songoda/epicbosses/mechanics/boss/HealthMechanic.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/mechanics/boss/HealthMechanic.java b/plugin-modules/Core/src/com/songoda/epicbosses/mechanics/boss/HealthMechanic.java index 059360e..3e5d2fb 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/mechanics/boss/HealthMechanic.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/mechanics/boss/HealthMechanic.java @@ -20,9 +20,8 @@ public class HealthMechanic implements IBossMechanic { public boolean applyMechanic(BossEntity bossEntity, ActiveBossHolder activeBossHolder) { if (activeBossHolder.getLivingEntityMap().getOrDefault(1, null) == null) return false; - Object o = SpigotYmlReader.get().getObject("settings.attribute.maxHealth.max"); - - double maxHealthSetting = o instanceof Double ? (double) o : (double) (int) o; + double maxHealthSetting = Double.valueOf( SpigotYmlReader + .get().getObject("settings.attribute.maxHealth.max").toString()); for (EntityStatsElement entityStatsElement : bossEntity.getEntityStats()) { MainStatsElement mainStatsElement = entityStatsElement.getMainStats(); From 2549af213de52f2264314ec7f239c21b79f7a998 Mon Sep 17 00:00:00 2001 From: songoda Date: Thu, 16 Jan 2020 21:43:42 -0500 Subject: [PATCH 2/2] version 1.2.6 --- api-modules/FactionsM/pom.xml | 2 +- api-modules/FactionsOne/pom.xml | 2 +- api-modules/FactionsUUID/pom.xml | 2 +- api-modules/LegacyFactions/pom.xml | 2 +- plugin-modules/Core/pom.xml | 2 +- plugin-modules/FactionHelper/pom.xml | 2 +- pom.xml | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/api-modules/FactionsM/pom.xml b/api-modules/FactionsM/pom.xml index 5788c8d..b723ca5 100644 --- a/api-modules/FactionsM/pom.xml +++ b/api-modules/FactionsM/pom.xml @@ -5,7 +5,7 @@ EpicBosses com.songoda.epicbosses - 1.2.5 + 1.2.6 ../../pom.xml 4.0.0 diff --git a/api-modules/FactionsOne/pom.xml b/api-modules/FactionsOne/pom.xml index 9fb167a..79b7e5b 100644 --- a/api-modules/FactionsOne/pom.xml +++ b/api-modules/FactionsOne/pom.xml @@ -5,7 +5,7 @@ EpicBosses com.songoda.epicbosses - 1.2.5 + 1.2.6 ../../pom.xml 4.0.0 diff --git a/api-modules/FactionsUUID/pom.xml b/api-modules/FactionsUUID/pom.xml index cb520d4..8e0a5f6 100644 --- a/api-modules/FactionsUUID/pom.xml +++ b/api-modules/FactionsUUID/pom.xml @@ -5,7 +5,7 @@ EpicBosses com.songoda.epicbosses - 1.2.5 + 1.2.6 ../../pom.xml 4.0.0 diff --git a/api-modules/LegacyFactions/pom.xml b/api-modules/LegacyFactions/pom.xml index 88f1f66..7bd09e6 100644 --- a/api-modules/LegacyFactions/pom.xml +++ b/api-modules/LegacyFactions/pom.xml @@ -5,7 +5,7 @@ EpicBosses com.songoda.epicbosses - 1.2.5 + 1.2.6 ../../pom.xml 4.0.0 diff --git a/plugin-modules/Core/pom.xml b/plugin-modules/Core/pom.xml index e9bd840..3ff2676 100644 --- a/plugin-modules/Core/pom.xml +++ b/plugin-modules/Core/pom.xml @@ -5,7 +5,7 @@ EpicBosses com.songoda.epicbosses - 1.2.5 + 1.2.6 ../../pom.xml 4.0.0 diff --git a/plugin-modules/FactionHelper/pom.xml b/plugin-modules/FactionHelper/pom.xml index f90804b..b0608c0 100644 --- a/plugin-modules/FactionHelper/pom.xml +++ b/plugin-modules/FactionHelper/pom.xml @@ -5,7 +5,7 @@ EpicBosses com.songoda.epicbosses - 1.2.5 + 1.2.6 ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index a9e2601..ab4d1a6 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.songoda.epicbosses EpicBosses pom - 1.2.5 + 1.2.6 api-modules/FactionsM @@ -16,7 +16,7 @@ - 1.2.5 + 1.2.6 EpicBosses com.songoda.epicbosses.EpicBosses Songoda