From 1581d18a43c75c26685dc38b45ebc55c99e6fe64 Mon Sep 17 00:00:00 2001
From: Electroblob <35599699+Electroblob77@users.noreply.github.com>
Date: Mon, 26 Feb 2018 18:36:13 +0000
Subject: [PATCH] Temporarily fix shadow ward not damaging its caster

---
 src/main/java/electroblob/wizardry/spell/ShadowWard.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/electroblob/wizardry/spell/ShadowWard.java b/src/main/java/electroblob/wizardry/spell/ShadowWard.java
index abd0da5e..594da63e 100644
--- a/src/main/java/electroblob/wizardry/spell/ShadowWard.java
+++ b/src/main/java/electroblob/wizardry/spell/ShadowWard.java
@@ -15,6 +15,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.SoundEvents;
 import net.minecraft.item.EnumAction;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.DamageSource;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.EnumParticleTypes;
 import net.minecraft.world.World;
@@ -58,8 +59,10 @@ public class ShadowWard extends Spell {
 
 				event.setCanceled(true);
 				// Now we can preserve the original damage source (sort of) as long as we make it retaliatory.
-				event.getEntityLiving().attackEntityFrom(
-						MagicDamage.causeDirectMagicDamage(event.getSource().getTrueSource(), DamageType.MAGIC, true), event.getAmount() * 0.5f);
+				// For some reason this isn't working, so I've reverted to plain old magic damage for now.
+				//event.getEntityLiving().attackEntityFrom(
+				//		MagicDamage.causeDirectMagicDamage(event.getSource().getTrueSource(), DamageType.MAGIC, true), event.getAmount() * 0.5f);
+				event.getEntityLiving().attackEntityFrom(DamageSource.MAGIC, event.getAmount() * 0.5f);
 				((EntityLivingBase)event.getSource().getTrueSource()).attackEntityFrom(
 						MagicDamage.causeDirectMagicDamage(event.getEntityLiving(), DamageType.MAGIC, true), event.getAmount() * 0.5f);
 			}