diff --git a/.idea/libraries/Maven__com_massivecraft_FactionsOne_1_2_1.xml b/.idea/libraries/Maven__com_massivecraft_FactionsOne_1_2_1.xml new file mode 100644 index 0000000..9f0eee9 --- /dev/null +++ b/.idea/libraries/Maven__com_massivecraft_FactionsOne_1_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_massivecraft_factions_FactionsUUID_1_6_9_5_U0_1_21.xml b/.idea/libraries/Maven__com_massivecraft_factions_FactionsUUID_1_6_9_5_U0_1_21.xml new file mode 100644 index 0000000..a1a7e36 --- /dev/null +++ b/.idea/libraries/Maven__com_massivecraft_factions_FactionsUUID_1_6_9_5_U0_1_21.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_massivecraft_factions_Factions_2_13_3_SNAPSHOT.xml b/.idea/libraries/Maven__com_massivecraft_factions_Factions_2_13_3_SNAPSHOT.xml new file mode 100644 index 0000000..6a4db9b --- /dev/null +++ b/.idea/libraries/Maven__com_massivecraft_factions_Factions_2_13_3_SNAPSHOT.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_massivecraft_massivecore_MassiveCore_2_13_3_1_SNAPSHOT.xml b/.idea/libraries/Maven__com_massivecraft_massivecore_MassiveCore_2_13_3_1_SNAPSHOT.xml new file mode 100644 index 0000000..b2ccdc7 --- /dev/null +++ b/.idea/libraries/Maven__com_massivecraft_massivecore_MassiveCore_2_13_3_1_SNAPSHOT.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_spigotmc_spigot_1_12_2.xml b/.idea/libraries/Maven__com_spigotmc_spigot_1_12_2.xml similarity index 50% rename from .idea/libraries/Maven__org_spigotmc_spigot_1_12_2.xml rename to .idea/libraries/Maven__com_spigotmc_spigot_1_12_2.xml index b872eb7..9948524 100644 --- a/.idea/libraries/Maven__org_spigotmc_spigot_1_12_2.xml +++ b/.idea/libraries/Maven__com_spigotmc_spigot_1_12_2.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_milkbowl_vault_Vault_1_6_6.xml b/.idea/libraries/Maven__net_milkbowl_vault_Vault_1_6_6.xml new file mode 100644 index 0000000..53d4129 --- /dev/null +++ b/.idea/libraries/Maven__net_milkbowl_vault_Vault_1_6_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_redstoneore_legacyfactions_LegacyFactions_1_4_7.xml b/.idea/libraries/Maven__net_redstoneore_legacyfactions_LegacyFactions_1_4_7.xml new file mode 100644 index 0000000..b5382fb --- /dev/null +++ b/.idea/libraries/Maven__net_redstoneore_legacyfactions_LegacyFactions_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/api-modules/FactionsM/pom.xml b/api-modules/FactionsM/pom.xml index 8a4763a..453857e 100644 --- a/api-modules/FactionsM/pom.xml +++ b/api-modules/FactionsM/pom.xml @@ -21,15 +21,15 @@ provided - com.massivecraft + com.massivecraft.factions Factions - LATEST + 2.13.3-SNAPSHOT provided - com.massivecraft + com.massivecraft.massivecore MassiveCore - LATEST + 2.13.3.1-SNAPSHOT provided diff --git a/api-modules/FactionsUUID/pom.xml b/api-modules/FactionsUUID/pom.xml index bad5d63..8f8da9e 100644 --- a/api-modules/FactionsUUID/pom.xml +++ b/api-modules/FactionsUUID/pom.xml @@ -21,9 +21,9 @@ provided - com.massivecraft + com.massivecraft.factions FactionsUUID - LATEST + 1.6.9.5-U0.1.21 provided diff --git a/api-modules/LegacyFactions/pom.xml b/api-modules/LegacyFactions/pom.xml index fb52f24..7313992 100644 --- a/api-modules/LegacyFactions/pom.xml +++ b/api-modules/LegacyFactions/pom.xml @@ -21,9 +21,9 @@ provided - com.massivecraft + net.redstoneore.legacyfactions LegacyFactions - LATEST + 1.4.7 provided diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/boss/BossNewCmd.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/boss/BossNewCmd.java index 91d39ca..8c781d3 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/boss/BossNewCmd.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/boss/BossNewCmd.java @@ -27,7 +27,7 @@ import java.util.List; * boss new skill [name] [type] [mode] * boss new command [name] [commands] * boss new message [name] [message] - * boss new autospawn [name] [type] + * boss new autospawn [name] */ public class BossNewCmd extends SubCommand { @@ -61,7 +61,7 @@ public class BossNewCmd extends SubCommand { //-------------------- // A U T O S P A W N //-------------------- - if(args.length == 4 && args[1].equalsIgnoreCase("autospawn")) { + if(args.length == 3 && args[1].equalsIgnoreCase("autospawn")) { String nameInput = args[2]; if(this.autoSpawnFileManager.getAutoSpawn(nameInput) != null) { diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/listeners/pre/BossSpawnListener.java b/plugin-modules/Core/src/com/songoda/epicbosses/listeners/pre/BossSpawnListener.java index 41fe1fe..a378ce9 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/listeners/pre/BossSpawnListener.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/listeners/pre/BossSpawnListener.java @@ -2,7 +2,6 @@ package com.songoda.epicbosses.listeners.pre; import com.songoda.epicbosses.CustomBosses; import com.songoda.epicbosses.api.BossAPI; -import com.songoda.epicbosses.container.BossEntityContainer; import com.songoda.epicbosses.entity.BossEntity; import com.songoda.epicbosses.events.BossSpawnEvent; import com.songoda.epicbosses.events.PreBossSpawnEvent; @@ -15,7 +14,6 @@ import com.songoda.epicbosses.managers.BossTauntManager; import com.songoda.epicbosses.utils.*; import com.songoda.epicbosses.utils.itemstack.ItemStackUtils; import com.songoda.epicbosses.utils.version.VersionHandler; -import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.Block; @@ -38,7 +36,6 @@ import java.util.Map; public class BossSpawnListener implements Listener { private BossLocationManager bossLocationManager; - private BossTargetManager bossTargetManager; private BossEntityManager bossEntityManager; private BossTauntManager bossTauntManager; private VersionHandler versionHandler; @@ -47,7 +44,6 @@ public class BossSpawnListener implements Listener { this.versionHandler = customBosses.getVersionHandler(); this.bossTauntManager = customBosses.getBossTauntManager(); this.bossEntityManager = customBosses.getBossEntityManager(); - this.bossTargetManager = customBosses.getBossTargetManager(); this.bossLocationManager = customBosses.getBossLocationManager(); } diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/utils/PotionEffectFinder.java b/plugin-modules/Core/src/com/songoda/epicbosses/utils/PotionEffectFinder.java index 83c065b..35f4f0b 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/utils/PotionEffectFinder.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/utils/PotionEffectFinder.java @@ -1,6 +1,7 @@ package com.songoda.epicbosses.utils; import lombok.Getter; +import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; import java.util.ArrayList; @@ -20,7 +21,7 @@ public enum PotionEffectFinder { Resistance("Resistance", PotionEffectType.DAMAGE_RESISTANCE, "damage_resistance", "res", "damageresistance"), Haste("Haste", PotionEffectType.FAST_DIGGING, "fast_digging", "haste"), Fire_Resistance("FireResistance", PotionEffectType.FIRE_RESISTANCE, "fire_resistance", "fire_resist", "fire_res", "fireresist", "fireres"), - Glowing("Glowing", PotionEffectType.GLOWING), + Glowing("Glowing", PotionEffectType.getByName("GLOWING")), Harm("Harm", PotionEffectType.HARM, "damage"), Heal("Heal", PotionEffectType.HEAL), HealthBoost("HealthBoost", PotionEffectType.HEALTH_BOOST, "healthboost", "health_boost"), @@ -28,8 +29,8 @@ public enum PotionEffectFinder { Strength("Strength", PotionEffectType.INCREASE_DAMAGE, "increase_damage", "increasedamage"), Invisibility("Invisibility", PotionEffectType.INVISIBILITY), Jump("Jump", PotionEffectType.JUMP), - Levitation("Levitation", PotionEffectType.LEVITATION), - Luck("Luck", PotionEffectType.LUCK), + Levitation("Levitation", PotionEffectType.getByName("LEVITATION")), + Luck("Luck", PotionEffectType.getByName("LUCK")), NightVision("NightVision", PotionEffectType.NIGHT_VISION, "seeinthedarkness", "nv", "night_vision"), Posion("Posion", PotionEffectType.POISON, "witched"), Regen("regen", PotionEffectType.REGENERATION, "regeneration"), @@ -37,7 +38,7 @@ public enum PotionEffectFinder { Slow("Slow", PotionEffectType.SLOW, "tank"), MiningFatigue("MiningFatigue", PotionEffectType.SLOW_DIGGING, "slow_digging"), Speed("Speed", PotionEffectType.SPEED, "fast", "fastboots"), - Unluck("Unlucky", PotionEffectType.UNLUCK, "unluck", "notlucky"), + Unluck("Unlucky", PotionEffectType.getByName("UNLUCK"), "unluck", "notlucky"), WaterBreathing("WaterBreathing", PotionEffectType.WATER_BREATHING, "breathunderwater", "water_breathing", "fish"), Weakness("Weakness", PotionEffectType.WEAKNESS), Wither("Wither", PotionEffectType.WITHER, "blackhearts"); @@ -68,7 +69,10 @@ public enum PotionEffectFinder { public static PotionEffectFinder getByEffect(PotionEffectType potionEffectType) { for(PotionEffectFinder potionEffectFinder : values()) { - if(potionEffectType.equals(potionEffectFinder.getPotionEffectType())) return potionEffectFinder; + PotionEffectType effectType = potionEffectFinder.getPotionEffectType(); + + if(effectType == null) continue; + if(potionEffectType.equals(effectType)) return potionEffectFinder; } return null; diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/utils/dependencies/HolographicDisplayHelper.java b/plugin-modules/Core/src/com/songoda/epicbosses/utils/dependencies/HolographicDisplayHelper.java index 186c764..6604156 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/utils/dependencies/HolographicDisplayHelper.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/utils/dependencies/HolographicDisplayHelper.java @@ -24,7 +24,7 @@ public class HolographicDisplayHelper implements IHelper { CustomBosses plugin = CustomBosses.get(); Hologram hologram = HologramsAPI.createHologram(plugin, livingEntity.getEyeLocation()); - hologram.insertTextLine(1, line); + hologram.appendTextLine(line); new BukkitRunnable() { @Override diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/utils/potion/PotionEffectConverter.java b/plugin-modules/Core/src/com/songoda/epicbosses/utils/potion/PotionEffectConverter.java index c02cd7a..31b9ac5 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/utils/potion/PotionEffectConverter.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/utils/potion/PotionEffectConverter.java @@ -41,7 +41,7 @@ public class PotionEffectConverter implements IConverter - 1.0.4 + 1.0.5 EpicBosses com.songoda.epicbosses.CustomBosses AMinecraftDev @@ -27,15 +27,15 @@ - org.spigotmc + com.spigotmc spigot 1.12.2 provided - net.milkbowl - vault - LATEST + net.milkbowl.vault + Vault + 1.6.6 provided @@ -81,10 +81,6 @@ filoghost-repo https://ci.filoghost.me/plugin/repository/everything/ - - private - http://repo.songoda.com/repository/private/ - vault-repo http://nexus.hc.to/content/repositories/pub_releases