diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 783b985..6c1ad30 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ stages: variables: name: "EpicBosses" path: "/builds/$CI_PROJECT_PATH" - version: "1.2.3" + version: "1.2.4" build: stage: build diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/managers/BossLocationManager.java b/plugin-modules/Core/src/com/songoda/epicbosses/managers/BossLocationManager.java index 4dde9cd..c3f387f 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/managers/BossLocationManager.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/managers/BossLocationManager.java @@ -58,11 +58,11 @@ public class BossLocationManager implements IReloadable { } } - if (WorldGuardHook.isEnabled()) { - if (WorldGuardHook.getBooleanFlag(location, "boss-blocked-region")) { - ServerUtils.get().logDebug("Unable to spawn boss due to worldguard region having the 'boss-blocked-region' flag"); - return false; - } + + Boolean flag; + if ((flag = WorldGuardHook.getBooleanFlag(location, "boss-blocked-region")) != null && flag) { + ServerUtils.get().logDebug("Unable to spawn boss due to worldguard region having the 'boss-blocked-region' flag"); + return false; } if (this.bossHookManager.isFactionsEnabled() && this.bossHookManager.getFactionHelper() != null) { 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 b0d5d9d..059360e 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,7 +20,9 @@ public class HealthMechanic implements IBossMechanic { public boolean applyMechanic(BossEntity bossEntity, ActiveBossHolder activeBossHolder) { if (activeBossHolder.getLivingEntityMap().getOrDefault(1, null) == null) return false; - double maxHealthSetting = (double) SpigotYmlReader.get().getObject("settings.attribute.maxHealth.max"); + Object o = SpigotYmlReader.get().getObject("settings.attribute.maxHealth.max"); + + double maxHealthSetting = o instanceof Double ? (double) o : (double) (int) o; for (EntityStatsElement entityStatsElement : bossEntity.getEntityStats()) { MainStatsElement mainStatsElement = entityStatsElement.getMainStats();