diff --git a/pom.xml b/pom.xml index 9522da55..4c554d94 100644 --- a/pom.xml +++ b/pom.xml @@ -30,11 +30,6 @@ jeff-media-public https://hub.jeff-media.com/nexus/repository/jeff-media-public/ - - sefi-central - Sefiraat - https://sefiraat.jfrog.io/artifactory/default-maven-local - bg-repo https://repo.bg-software.com/repository/api/ @@ -170,9 +165,9 @@ - net.guizhanss + com.github.SlimefunGuguProject ExoticGarden - 171aca2211 + edae221160 provided @@ -188,9 +183,9 @@ - io.github.sefiraat - networks - MODIFIED_1.0.7 + com.github.Sefiraat + Networks + 3de3c9d608 provided @@ -220,7 +215,7 @@ - net.guizhanss + com.github.SlimefunGuguProject InfinityLib 1.3.9 compile @@ -230,7 +225,7 @@ net.guizhanss GuizhanLibPlugin - 1.1.1 + 1.6.1 provided diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/CrystamaeHistoria.java b/src/main/java/io/github/sefiraat/crystamaehistoria/CrystamaeHistoria.java index 9183c0ef..f871fc91 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/CrystamaeHistoria.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/CrystamaeHistoria.java @@ -35,8 +35,7 @@ import io.github.sefiraat.crystamaehistoria.stories.BlockDefinition; import io.github.thebusybiscuit.slimefun4.libraries.dough.collections.Pair; import io.github.thebusybiscuit.slimefun4.libraries.paperlib.PaperLib; -import net.guizhanss.guizhanlib.updater.GuizhanBuildsUpdater; -import net.guizhanss.guizhanlibplugin.updater.GuizhanBuildsUpdaterWrapper; +import net.guizhanss.guizhanlibplugin.updater.GuizhanUpdater; import org.bstats.bukkit.Metrics; import org.bstats.charts.AdvancedPie; import org.bukkit.plugin.PluginManager; @@ -176,7 +175,7 @@ public void enable() { } if (getConfig().getBoolean("auto-update") && getDescription().getVersion().startsWith("Build")) { - GuizhanBuildsUpdaterWrapper.start(this, getFile(), "SlimefunGuguProject", "CrystamaeHistoria", "master", false); + GuizhanUpdater.start(this, getFile(), "SlimefunGuguProject", "CrystamaeHistoria", "master"); } this.configManager = new ConfigManager(); diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/listeners/SpellEffectListener.java b/src/main/java/io/github/sefiraat/crystamaehistoria/listeners/SpellEffectListener.java index cbb7bcc6..3e79e3f8 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/listeners/SpellEffectListener.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/listeners/SpellEffectListener.java @@ -111,6 +111,9 @@ public void onFallingBlockLands(EntityChangeBlockEvent event) { } private boolean entityHitAllowed(CastInformation castInformation, Entity hitEntity) { + if (hitEntity == null) { + return false; + } final Player player = Bukkit.getPlayer(castInformation.getCaster()); final Interaction interaction = hitEntity instanceof Player ? Interaction.ATTACK_PLAYER : Interaction.ATTACK_ENTITY; if (player != null && GeneralUtils.hasPermission(player, hitEntity.getLocation(), interaction)) {