Develop

core/common/src/main/kotlin/com/willfp/libreforge/conditions/impl/ConditionInAir.kt

@@ -5,6 +5,8 @@ import com.willfp.libreforge.Dispatcher
 import com.willfp.libreforge.NoCompileData
 import com.willfp.libreforge.ProvidedHolder
 import com.willfp.libreforge.conditions.Condition
+import org.bukkit.Material
+import org.bukkit.block.BlockFace
 
 object ConditionInAir : Condition<NoCompileData>("in_air") {
     override fun isMet(
@@ -14,6 +16,6 @@ object ConditionInAir : Condition<NoCompileData>("in_air") {
         compileData: NoCompileData
     ): Boolean {
         val location = dispatcher.location ?: return false
-        return location.block.isEmpty
+        return location.block.getRelative(BlockFace.DOWN).type == Material.AIR;
     }
 }

core/common/src/main/kotlin/com/willfp/libreforge/conditions/impl/ConditionOnGround.kt

@@ -15,6 +15,6 @@ object ConditionOnGround : Condition<NoCompileData>("on_ground") {
         compileData: NoCompileData
     ): Boolean {
         val location = dispatcher.location ?: return false
-        return location.block.getRelative(BlockFace.SOUTH).isSolid
+        return location.block.getRelative(BlockFace.DOWN).isSolid
     }
 }

core/common/src/main/kotlin/com/willfp/libreforge/effects/impl/EffectPermanentPotionEffect.kt

@@ -44,25 +44,39 @@ object EffectPermanentPotionEffect : Effect<NoCompileData>("permanent_potion_eff
         val icon: Boolean
     )
 
+    private fun getHolderData(player: Player): MutableMap<UUID, PotionEffectData> {
+        return player.getMetadata(metaKey).firstOrNull()?.value()
+                as? MutableMap<UUID, PotionEffectData>
+            ?: mutableMapOf()
+    }
+
+    private fun refreshEffectsOfType(player: Player, type: PotionEffectType) {
+        player.removePotionEffect(type)
+        val active = getHolderData(player)
+            .values
+            .filter { it.effectType == type }
+        if (active.isEmpty()) return
+        val best = active.maxByOrNull { it.level }!!
+        val effect = PotionEffect(
+            type,
+            DURATION,
+            best.level,
+            false,
+            active.any { it.particles },
+            active.any { it.icon }
+        )
+        player.addPotionEffect(effect)
+    }
+
     @EventHandler
     fun onRespawn(event: PlayerRespawnEvent) {
         val player = event.player
+        val types = getHolderData(player)
+            .values
+            .map { it.effectType }
+            .toSet()
 
-        val meta = player.getMetadata(metaKey).firstOrNull()?.value()
-                as? MutableMap<UUID, PotionEffectData> ?: mutableMapOf()
-
-        for ((_, data) in meta) {
-            val effect = PotionEffect(
-                data.effectType,
-                DURATION,
-                data.level,
-                false,
-                data.particles,
-                data.icon
-            )
-
-            player.addPotionEffect(effect)
-        }
+        types.forEach { refreshEffectsOfType(player, it) }
     }
 
     override fun onEnable(
@@ -82,42 +96,20 @@ object EffectPermanentPotionEffect : Effect<NoCompileData>("permanent_potion_eff
         val icon = config.getBoolOrNull("icon") ?: true
         val particles = config.getBoolOrNull("particles") ?: true
 
-        val effect = PotionEffect(
-            effectType,
-            DURATION,
-            level,
-            false,
-            particles,
-            icon
-        )
-
-        player.addPotionEffect(effect)
-
-        val meta = player.getMetadata(metaKey).firstOrNull()?.value()
-                as? MutableMap<UUID, PotionEffectData> ?: mutableMapOf()
+        val holderData = getHolderData(player)
+        holderData[identifiers.uuid] = PotionEffectData(effectType, level, particles, icon)
+        player.setMetadata(metaKey, plugin.metadataValueFactory.create(holderData))
 
-        meta[identifiers.uuid] = PotionEffectData(effectType, level, particles, icon)
-
-        player.setMetadata(metaKey, plugin.metadataValueFactory.create(meta))
+        refreshEffectsOfType(player, effectType)
     }
 
     override fun onDisable(dispatcher: Dispatcher<*>, identifiers: Identifiers, holder: ProvidedHolder) {
         val player = dispatcher.get<Player>() ?: return
 
-        val meta = player.getMetadata(metaKey).firstOrNull()?.value()
-                as? MutableMap<UUID, PotionEffectData> ?: mutableMapOf()
-
-        val data = meta[identifiers.uuid] ?: return
-
-        val active = player.getPotionEffect(data.effectType) ?: return
-
-        if (active.duration < 0) {
-            return
-        }
-
-        meta.remove(identifiers.uuid)
-        player.setMetadata(metaKey, plugin.metadataValueFactory.create(meta))
+        val holderData = getHolderData(player)
+        val removed = holderData.remove(identifiers.uuid) ?: return
+        player.setMetadata(metaKey, plugin.metadataValueFactory.create(holderData))
 
-        player.removePotionEffect(data.effectType)
+        refreshEffectsOfType(player, removed.effectType)
     }
 }

core/common/src/main/kotlin/com/willfp/libreforge/effects/impl/EffectSpawnPotionCloud.kt

@@ -42,6 +42,7 @@ object EffectSpawnPotionCloud : Effect<NoCompileData>("spawn_potion_cloud") {
         )
 
         cloud.source = data.player
+        cloud.duration = duration
 
         return true
     }

core/common/src/main/kotlin/com/willfp/libreforge/triggers/impl/TriggerTakeDamage.kt

@@ -39,8 +39,10 @@ object TriggerTakeDamage : Trigger("take_damage") {
         if (Bukkit.getPluginManager().isPluginEnabled("MythicMobs")) {
             if (event is EntityDamageByEntityEvent) {
                 val attacker = event.damager.tryAsLivingEntity()
-                if (MythicBukkit.inst().mobManager.isMythicMob(attacker)) {
-                    return
+                if (attacker != null) {
+                    if (MythicBukkit.inst().mobManager.isMythicMob(attacker)) {
+                        return
+                    }
                 }
             }
         }