Merge remote-tracking branch 'origin/master'

2026-01-02 05:46:57 +00:00 · 2021-09-27 12:48:12 +01:00
parent 8cecdeffee 10111137db
commit 7db1220b90
2 changed files with 3 additions and 2 deletions
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/effects/EffectPotionmaster.kt
+++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/effects/EffectPotionmaster.kt
@@ -99,7 +99,8 @@ class EffectPotionmaster : Effect(
            effects[PotionEffectType.SLOW] = 4
            effects[PotionEffectType.DAMAGE_RESISTANCE] = 2
        } else {
-            effects[data.type.effectType!!] = if (data.type.isUpgradeable) 2 else 1
+            val effectType = data.type.effectType ?: return
+            effects[effectType] = if (data.type.isUpgradeable) 2 else 1
        }

        for ((k, v) in effects) {
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,2 @@
-version = 1.3.1
+version = 1.3.2
 plugin-name = EcoSkills