From 587ab1338e654ad32aa88df633c0c5cbb0aed291 Mon Sep 17 00:00:00 2001
From: Electroblob77 <35599699+Electroblob77@users.noreply.github.com>
Date: Wed, 18 Mar 2020 14:57:04 +0000
Subject: [PATCH] Make Magic Protection protect against vanilla magic damage,
 closes #337

---
 .../wizardry/enchantment/EnchantmentMagicProtection.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/electroblob/wizardry/enchantment/EnchantmentMagicProtection.java b/src/main/java/electroblob/wizardry/enchantment/EnchantmentMagicProtection.java
index c397d37b..12222480 100644
--- a/src/main/java/electroblob/wizardry/enchantment/EnchantmentMagicProtection.java
+++ b/src/main/java/electroblob/wizardry/enchantment/EnchantmentMagicProtection.java
@@ -68,7 +68,7 @@ public class EnchantmentMagicProtection extends Enchantment {
 
 	public enum Type {
 
-		MAGIC("magic", 1, 5, 8, s -> s instanceof IElementalDamage),
+		MAGIC("magic", 1, 5, 8, s -> s instanceof IElementalDamage || s.isMagicDamage()),
 		FROST("frost", 2, 10, 8, s -> s instanceof IElementalDamage && ((IElementalDamage)s).getType() == MagicDamage.DamageType.FROST),
 		SHOCK("shock", 2, 10, 8, s -> s instanceof IElementalDamage && ((IElementalDamage)s).getType() == MagicDamage.DamageType.SHOCK);
 		// Fire already exists, and the other types aren't used enough to be worth having