From 486425a62c311e6d9b6e6b1eb735a49bf52a5dc7 Mon Sep 17 00:00:00 2001
From: WinDanesz <31292708+WinDanesz@users.noreply.github.com>
Date: Sun, 2 Jan 2022 22:07:05 +0100
Subject: [PATCH] Frostbite effect and entity burning now cancels each other

---
 .../electroblob/wizardry/potion/PotionFrost.java  | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/main/java/electroblob/wizardry/potion/PotionFrost.java b/src/main/java/electroblob/wizardry/potion/PotionFrost.java
index 3ce17d8a..15b44b25 100644
--- a/src/main/java/electroblob/wizardry/potion/PotionFrost.java
+++ b/src/main/java/electroblob/wizardry/potion/PotionFrost.java
@@ -5,6 +5,7 @@ import electroblob.wizardry.constants.Constants;
 import electroblob.wizardry.registry.WizardryPotions;
 import electroblob.wizardry.util.ParticleBuilder;
 import electroblob.wizardry.util.ParticleBuilder.Type;
+import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.SharedMonsterAttributes;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
@@ -50,4 +51,18 @@ public class PotionFrost extends PotionMagicEffect implements ICustomPotionParti
 		}
 	}
 
+	@Override
+	public void performEffect(EntityLivingBase entitylivingbase, int strength) {
+		if (entitylivingbase.isBurning()) {
+			if (entitylivingbase.isPotionActive(WizardryPotions.frost)) {
+				entitylivingbase.removePotionEffect(WizardryPotions.frost);
+				entitylivingbase.extinguish();
+			}
+		}
+	}
+
+	@Override
+	public boolean isReady(int duration, int amplifier) {
+		return true;
+	}
 }