Refactored Antifire potion effect

Relicym Balm can now cure disease
Antifire potion effect now persists through log out

Server/src/main/core/api/ContentAPI.kt

@@ -3122,7 +3122,7 @@ fun calculateDragonfireMaxHit(entity: Entity, maxDamage: Int, wyvern: Boolean =
 
     if (entity is Player) {
         hasShield = hasDragonfireShieldProtection(entity, wyvern)
-        hasPotion = !wyvern && getAttribute(entity, "fire:immune", 0) >= getWorldTicks()
+        hasPotion = !wyvern && hasTimerActive<DragonFireImmunity>(entity)
         hasPrayer = entity.prayer.get(PrayerType.PROTECT_FROM_MAGIC)
 
         if (sendMessage) {

Server/src/main/core/game/system/timer/impl/DragonFireImmunity.kt

@@ -0,0 +1,47 @@
+package core.game.system.timer.impl
+
+import core.game.system.timer.*
+import core.api.*
+import core.tools.*
+import core.game.node.entity.Entity
+import core.game.node.entity.player.Player
+import org.json.simple.*
+import org.rs09.consts.Sounds
+
+/**
+ * A timer that replicates the behavior of Dragon Fire immunity mechanics. Runs every tick.
+ * Will notify the player of various levels of remaining Dragon Fire immunity, and then remove itself once it has run out.
+ * This timer is a "soft" timer, meaning it will tick down even while other timers would normally stall (e.g. during entity delays or when the entity has a modal open.)
+**/
+class DragonFireImmunity : PersistTimer (1, "dragonfire:immunity", isSoft = true, flags = arrayOf(TimerFlag.ClearOnDeath)) {
+    var ticksRemaining = 0
+
+    override fun save (root: JSONObject, entity: Entity) {
+        root["ticksRemaining"] = ticksRemaining.toString()
+    }
+
+    override fun parse (root: JSONObject, entity: Entity) {
+        ticksRemaining = root["ticksRemaining"].toString().toInt()
+    }
+
+    override fun run (entity: Entity) : Boolean {
+        ticksRemaining--
+
+        if (entity is Player && ticksRemaining == secondsToTicks(30)) {
+            sendMessage(entity, colorize("%RYou have 30 seconds remaining on your antifire potion."))
+            playAudio(entity, Sounds.CLOCK_TICK_1_3120, 0, 3)
+        }
+        else if (entity is Player && ticksRemaining == 0) {
+            sendMessage(entity, colorize("%RYour antifire potion has expired."))
+            playAudio(entity, Sounds.DRAGON_POTION_FINISHED_2607)
+        }
+
+        return ticksRemaining > 0
+    }
+
+    override fun getTimer (vararg args: Any) : RSTimer {
+        val t =  DragonFireImmunity()
+        t.ticksRemaining = args.getOrNull(0) as? Int ?: 100
+        return t
+    }
+}