From 203bec560eff623b9ae2e9de40447e427d08f658 Mon Sep 17 00:00:00 2001 From: _OfTeN_ Date: Sun, 19 Sep 2021 23:01:40 +0300 Subject: [PATCH] Updated how mythic mob fetcher works --- .../bosses/util/bosstype/BossEntityUtils.java | 26 ++++++++++--------- .../core-plugin/src/main/resources/plugin.yml | 3 +++ 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/util/bosstype/BossEntityUtils.java b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/util/bosstype/BossEntityUtils.java index 4458205..5a2b062 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/util/bosstype/BossEntityUtils.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/util/bosstype/BossEntityUtils.java @@ -27,22 +27,24 @@ public class BossEntityUtils { */ public static BossType getBossType(@NotNull String id) { - if (mythicMobs && id.startsWith("mythicmobs_")) { - int level; + if (id.startsWith("mythicmobs_")) { + if (mythicMobs) { + int level; - try { - level = Integer.parseInt(Arrays.stream(id.split("_")).toList().get(id.split("_").length-1)); - } catch (NumberFormatException exception) { - level = 1; - } + try { + level = Integer.parseInt(Arrays.stream(id.split("_")).toList().get(id.split("_").length-1)); + } catch (NumberFormatException exception) { + level = 1; + } - MythicMob mob = MythicMobs.inst().getMobManager().getMythicMob(id.replace("mythicmobs_", "").replace("_"+level, "")); + MythicMob mob = MythicMobs.inst().getMobManager().getMythicMob(id.replace("mythicmobs_", "").replace("_"+level, "")); - if (mob != null) { - return new MythicMobsBossType(mob, level); - } + if (mob != null) { + return new MythicMobsBossType(mob, level); + } + else id = "zombie"; + } else id = "zombie"; - else id = "zombie"; } try { diff --git a/eco-core/core-plugin/src/main/resources/plugin.yml b/eco-core/core-plugin/src/main/resources/plugin.yml index 5f4310d..5e53d69 100644 --- a/eco-core/core-plugin/src/main/resources/plugin.yml +++ b/eco-core/core-plugin/src/main/resources/plugin.yml @@ -5,6 +5,9 @@ api-version: 1.16 authors: [Auxilor] website: willfp.com load: STARTUP +softdepend: + - MythicMobs + - LevelledMobs depend: - eco