From 2aa29b3c817468bef76e1af642e02e3478fc33fd Mon Sep 17 00:00:00 2001 From: Brianna Date: Thu, 16 Apr 2020 04:48:12 -0400 Subject: [PATCH 1/4] Check for null values better. --- .../src/com/songoda/epicbosses/holder/ActiveMinionHolder.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/holder/ActiveMinionHolder.java b/plugin-modules/Core/src/com/songoda/epicbosses/holder/ActiveMinionHolder.java index 4b904ff..0c54dad 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/holder/ActiveMinionHolder.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/holder/ActiveMinionHolder.java @@ -73,7 +73,8 @@ public class ActiveMinionHolder implements IActiveHolder { // this.livingEntityMap.clear(); // grab list of all valid entities by UUID that can be removed - Map toRemove = this.livingEntityMap.entrySet().stream().filter(Objects::nonNull) + Map toRemove = this.livingEntityMap.entrySet().stream() + .filter(e -> e != null && e.getValue() != null && ServerUtils.get().getEntity(e.getValue()) != null) .collect(Collectors.toMap(Map.Entry::getKey, e -> ServerUtils.get().getEntity(e.getValue()))) .entrySet().stream() .filter(e -> e.getValue() != null && e.getValue().getWorld().isChunkLoaded( From d11126329723a39f9073dca5b2789a1de40b6045 Mon Sep 17 00:00:00 2001 From: Brianna Date: Sat, 9 May 2020 15:44:36 -0400 Subject: [PATCH 2/4] Lets fix these messages. --- .../songoda/epicbosses/listeners/during/BossSkillListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/listeners/during/BossSkillListener.java b/plugin-modules/Core/src/com/songoda/epicbosses/listeners/during/BossSkillListener.java index 6f91a6f..269a388 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/listeners/during/BossSkillListener.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/listeners/during/BossSkillListener.java @@ -101,7 +101,7 @@ public class BossSkillListener implements Listener { String customMessage = skill.getCustomMessage(); if (customMessage != null) - masterMessage = Arrays.asList(skill.getCustomMessage()); + masterMessage = BossAPI.getStoredMessages(skill.getCustomMessage()); List targettedEntities = this.bossSkillManager.getTargetedEntities(activeBossHolder, skill, activeBossHolder.getLivingEntity().getLocation(), damagingEntity); From 279e8bf65c4a8408540e3fdce5b70f2577c2b57b Mon Sep 17 00:00:00 2001 From: Brianna Date: Sat, 9 May 2020 18:04:50 -0400 Subject: [PATCH 3/4] Placeholder optimizations. --- .../src/com/songoda/epicbosses/EpicBosses.java | 16 +++++++--------- .../epicbosses/managers/PlaceholderManager.java | 10 +++++++--- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/EpicBosses.java b/plugin-modules/Core/src/com/songoda/epicbosses/EpicBosses.java index 3aba2f5..5bcbce0 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/EpicBosses.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/EpicBosses.java @@ -60,7 +60,6 @@ public class EpicBosses extends SongodaPlugin implements IReloadable { private BossHookManager bossHookManager; private AutoSpawnManager autoSpawnManager; - private PlaceholderManager placeholderManager; private MinionMechanicManager minionMechanicManager; private MinionEntityContainer minionEntityContainer; @@ -135,10 +134,8 @@ public class EpicBosses extends SongodaPlugin implements IReloadable { this.autoSpawnManager = new AutoSpawnManager(this); - if (Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null) { - this.placeholderManager = new PlaceholderManager(this); - this.placeholderManager.register(); - } + if (Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI")) + new PlaceholderManager(this).register(); createFiles(); reloadFiles(); @@ -198,6 +195,11 @@ public class EpicBosses extends SongodaPlugin implements IReloadable { this.autoSpawnManager.startIntervalSystems(); + if (Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI")) { + System.out.println("hiiiit"); + new PlaceholderManager(this).register(); + } + ServerUtils.get().logDebug("Loaded all fields and managers, saved messages and plugin is initialized and ready to go. (took " + (System.currentTimeMillis() - beginMs) + "ms)."); } @@ -349,10 +351,6 @@ public class EpicBosses extends SongodaPlugin implements IReloadable { return this.autoSpawnManager; } - public PlaceholderManager getPlaceholderManager() { - return this.placeholderManager; - } - public MinionMechanicManager getMinionMechanicManager() { return this.minionMechanicManager; } diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/managers/PlaceholderManager.java b/plugin-modules/Core/src/com/songoda/epicbosses/managers/PlaceholderManager.java index af6fa1a..15eef2a 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/managers/PlaceholderManager.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/managers/PlaceholderManager.java @@ -8,7 +8,7 @@ import org.bukkit.OfflinePlayer; public class PlaceholderManager extends PlaceholderExpansion { - private AutoSpawnManager autoSpawnManager; + private final AutoSpawnManager autoSpawnManager; public PlaceholderManager(EpicBosses plugin) { this.autoSpawnManager = plugin.getAutoSpawnManager(); @@ -24,10 +24,14 @@ public class PlaceholderManager extends PlaceholderExpansion { ActiveIntervalAutoSpawnHolder intervalAutoSpawnHolder = (ActiveIntervalAutoSpawnHolder) autoSpawnHolder; long duration = (long) (intervalAutoSpawnHolder.getRemainingMs() / 1000D); - String formattedIdentifier = intervalAutoSpawnHolder.getIntervalSpawnElement().getPlaceholder() + "_formatted"; + String placeHolder = intervalAutoSpawnHolder.getIntervalSpawnElement().getPlaceholder() + .replace("{", "") + .replace("}", ""); + + String formattedIdentifier = placeHolder + "_formatted"; if (identifier.equalsIgnoreCase(formattedIdentifier)) { return this.getTimeFormatted(duration); - } else if (identifier.equals(intervalAutoSpawnHolder.getIntervalSpawnElement().getPlaceholder())) { + } else if (identifier.equals(placeHolder)) { return String.valueOf((int) (intervalAutoSpawnHolder.getRemainingMs() / 1000D)); } } From 331fb487e2812a2c693f16fbbebadc8351237b70 Mon Sep 17 00:00:00 2001 From: Brianna Date: Sat, 9 May 2020 18:05:11 -0400 Subject: [PATCH 4/4] version 1.2.12 --- 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 8f62a96..4ab6cab 100644 --- a/api-modules/FactionsM/pom.xml +++ b/api-modules/FactionsM/pom.xml @@ -5,7 +5,7 @@ EpicBosses com.songoda.epicbosses - 1.2.11 + 1.2.12 ../../pom.xml 4.0.0 diff --git a/api-modules/FactionsOne/pom.xml b/api-modules/FactionsOne/pom.xml index 3abd6a1..72bba7f 100644 --- a/api-modules/FactionsOne/pom.xml +++ b/api-modules/FactionsOne/pom.xml @@ -5,7 +5,7 @@ EpicBosses com.songoda.epicbosses - 1.2.11 + 1.2.12 ../../pom.xml 4.0.0 diff --git a/api-modules/FactionsUUID/pom.xml b/api-modules/FactionsUUID/pom.xml index 1188259..46688c5 100644 --- a/api-modules/FactionsUUID/pom.xml +++ b/api-modules/FactionsUUID/pom.xml @@ -5,7 +5,7 @@ EpicBosses com.songoda.epicbosses - 1.2.11 + 1.2.12 ../../pom.xml 4.0.0 diff --git a/api-modules/LegacyFactions/pom.xml b/api-modules/LegacyFactions/pom.xml index c97b28b..e9dd6fa 100644 --- a/api-modules/LegacyFactions/pom.xml +++ b/api-modules/LegacyFactions/pom.xml @@ -5,7 +5,7 @@ EpicBosses com.songoda.epicbosses - 1.2.11 + 1.2.12 ../../pom.xml 4.0.0 diff --git a/plugin-modules/Core/pom.xml b/plugin-modules/Core/pom.xml index daa5ae8..50d2e44 100644 --- a/plugin-modules/Core/pom.xml +++ b/plugin-modules/Core/pom.xml @@ -5,7 +5,7 @@ EpicBosses com.songoda.epicbosses - 1.2.11 + 1.2.12 ../../pom.xml 4.0.0 diff --git a/plugin-modules/FactionHelper/pom.xml b/plugin-modules/FactionHelper/pom.xml index 6f2fa60..10b933a 100644 --- a/plugin-modules/FactionHelper/pom.xml +++ b/plugin-modules/FactionHelper/pom.xml @@ -5,7 +5,7 @@ EpicBosses com.songoda.epicbosses - 1.2.11 + 1.2.12 ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index c82b286..b0ac0c5 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.songoda.epicbosses EpicBosses pom - 1.2.11 + 1.2.12 api-modules/FactionsM @@ -16,7 +16,7 @@ - 1.2.11 + 1.2.12 EpicBosses com.songoda.epicbosses.EpicBosses Songoda