diff --git a/src/main/java/electroblob/wizardry/spell/FlameRay.java b/src/main/java/electroblob/wizardry/spell/FlameRay.java
index f2384b74..9c2852f8 100644
--- a/src/main/java/electroblob/wizardry/spell/FlameRay.java
+++ b/src/main/java/electroblob/wizardry/spell/FlameRay.java
@@ -79,36 +79,41 @@ public class FlameRay extends Spell {
 	public boolean cast(World world, EntityLiving caster, EnumHand hand, int ticksInUse, EntityLivingBase target,
 			SpellModifiers modifiers){
 
-		Vec3d vec = new Vec3d(target.posX - caster.posX, target.posY - caster.posY, target.posZ - caster.posZ)
-				.normalize();
-
 		if(target != null){
+
+			Vec3d vec = new Vec3d(target.posX - caster.posX, target.posY - caster.posY, target.posZ - caster.posZ).normalize();
+
 			target.setFire(10);
 			WizardryUtilities.attackEntityWithoutKnockback(target,
 					MagicDamage.causeDirectMagicDamage(caster, DamageType.FIRE),
 					3.0f * modifiers.get(SpellModifiers.DAMAGE));
-		}
-		if(world.isRemote){
-			for(int i = 0; i < 20; i++){
-				double x1 = caster.posX + vec.x * i / 2 + world.rand.nextFloat() / 5 - 0.1f;
-				double y1 = caster.posY + caster.getEyeHeight() - 0.4f + vec.y * i / 2 + world.rand.nextFloat() / 5
-						- 0.1f;
-				double z1 = caster.posZ + vec.z * i / 2 + world.rand.nextFloat() / 5 - 0.1f;
-				Wizardry.proxy.spawnParticle(WizardryParticleType.MAGIC_FIRE, world, x1, y1, z1,
-						vec.x * modifiers.get(WizardryItems.range_upgrade),
-						vec.y * modifiers.get(WizardryItems.range_upgrade),
-						vec.z * modifiers.get(WizardryItems.range_upgrade), 0);
-				Wizardry.proxy.spawnParticle(WizardryParticleType.MAGIC_FIRE, world, x1, y1, z1,
-						vec.x * modifiers.get(WizardryItems.range_upgrade),
-						vec.y * modifiers.get(WizardryItems.range_upgrade),
-						vec.z * modifiers.get(WizardryItems.range_upgrade), 0);
+			
+			if(world.isRemote){
+				for(int i = 0; i < 20; i++){
+					double x1 = caster.posX + vec.x * i / 2 + world.rand.nextFloat() / 5 - 0.1f;
+					double y1 = caster.posY + caster.getEyeHeight() - 0.4f + vec.y * i / 2 + world.rand.nextFloat() / 5
+							- 0.1f;
+					double z1 = caster.posZ + vec.z * i / 2 + world.rand.nextFloat() / 5 - 0.1f;
+					Wizardry.proxy.spawnParticle(WizardryParticleType.MAGIC_FIRE, world, x1, y1, z1,
+							vec.x * modifiers.get(WizardryItems.range_upgrade),
+							vec.y * modifiers.get(WizardryItems.range_upgrade),
+							vec.z * modifiers.get(WizardryItems.range_upgrade), 0);
+					Wizardry.proxy.spawnParticle(WizardryParticleType.MAGIC_FIRE, world, x1, y1, z1,
+							vec.x * modifiers.get(WizardryItems.range_upgrade),
+							vec.y * modifiers.get(WizardryItems.range_upgrade),
+							vec.z * modifiers.get(WizardryItems.range_upgrade), 0);
+				}
 			}
+			
+			if(ticksInUse % 16 == 0){
+				if(ticksInUse == 0) caster.playSound(SoundEvents.ENTITY_BLAZE_SHOOT, 1, 1);
+				caster.playSound(WizardrySounds.SPELL_LOOP_FIRE, 0.5F, 1.0f);
+			}
+			
+			return true;
 		}
-		if(ticksInUse % 16 == 0){
-			if(ticksInUse == 0) caster.playSound(SoundEvents.ENTITY_BLAZE_SHOOT, 1, 1);
-			caster.playSound(WizardrySounds.SPELL_LOOP_FIRE, 0.5F, 1.0f);
-		}
-		return true;
+		
+		return false;
 	}
 
 	@Override
diff --git a/src/main/java/electroblob/wizardry/spell/LifeDrain.java b/src/main/java/electroblob/wizardry/spell/LifeDrain.java
index 818cc010..0e014595 100644
--- a/src/main/java/electroblob/wizardry/spell/LifeDrain.java
+++ b/src/main/java/electroblob/wizardry/spell/LifeDrain.java
@@ -72,39 +72,43 @@ public class LifeDrain extends Spell {
 	public boolean cast(World world, EntityLiving caster, EnumHand hand, int ticksInUse, EntityLivingBase target,
 			SpellModifiers modifiers){
 
-		Vec3d vec = new Vec3d(target.posX - caster.posX, target.posY - caster.posY, target.posZ - caster.posZ)
-				.normalize();
-
 		if(target != null){
+
+			Vec3d vec = new Vec3d(target.posX - caster.posX, target.posY - caster.posY, target.posZ - caster.posZ).normalize();
+			
 			if(ticksInUse % 12 == 0){
 				WizardryUtilities.attackEntityWithoutKnockback(target,
 						MagicDamage.causeDirectMagicDamage(caster, DamageType.MAGIC),
 						2.0f * modifiers.get(SpellModifiers.DAMAGE));
 				caster.heal(1);
 			}
-		}
-		if(world.isRemote){
-			for(int i = 5; i < (int)(25 * modifiers.get(WizardryItems.range_upgrade)); i += 2){
-				// I figured it out! when on client side, entityplayer.posY is at the eyes, not the feet!
-				double x1 = caster.posX + vec.x * i / 2 + world.rand.nextFloat() / 5 - 0.1f;
-				double y1 = caster.posY + caster.getEyeHeight() - 0.4f + vec.y * i / 2 + world.rand.nextFloat() / 5
-						- 0.1f;
-				double z1 = caster.posZ + vec.z * i / 2 + world.rand.nextFloat() / 5 - 0.1f;
-				// world.spawnParticle("mobSpell", x1, y1, z1, -1*look.xCoord, -1*look.yCoord, -1*look.zCoord);
-				if(i % 5 == 0){
-					Wizardry.proxy.spawnParticle(WizardryParticleType.DARK_MAGIC, world, x1, y1, z1, 0.0d, 0.0d, 0.0d,
-							0, 0.1f, 0.0f, 0.0f);
+			
+			if(world.isRemote){
+				for(int i = 5; i < (int)(25 * modifiers.get(WizardryItems.range_upgrade)); i += 2){
+					// I figured it out! when on client side, entityplayer.posY is at the eyes, not the feet!
+					double x1 = caster.posX + vec.x * i / 2 + world.rand.nextFloat() / 5 - 0.1f;
+					double y1 = caster.posY + caster.getEyeHeight() - 0.4f + vec.y * i / 2 + world.rand.nextFloat() / 5
+							- 0.1f;
+					double z1 = caster.posZ + vec.z * i / 2 + world.rand.nextFloat() / 5 - 0.1f;
+					// world.spawnParticle("mobSpell", x1, y1, z1, -1*look.xCoord, -1*look.yCoord, -1*look.zCoord);
+					if(i % 5 == 0){
+						Wizardry.proxy.spawnParticle(WizardryParticleType.DARK_MAGIC, world, x1, y1, z1, 0.0d, 0.0d, 0.0d,
+								0, 0.1f, 0.0f, 0.0f);
+					}
+					Wizardry.proxy.spawnParticle(WizardryParticleType.SPARKLE, world, x1, y1, z1, -0.05 * vec.x * i,
+							-0.05 * vec.y * i, -0.05 * vec.z * i, 8 + world.rand.nextInt(6), 0.5f, 0.0f, 0.0f);
 				}
-				Wizardry.proxy.spawnParticle(WizardryParticleType.SPARKLE, world, x1, y1, z1, -0.05 * vec.x * i,
-						-0.05 * vec.y * i, -0.05 * vec.z * i, 8 + world.rand.nextInt(6), 0.5f, 0.0f, 0.0f);
 			}
-		}
-		if(ticksInUse % 18 == 0){
-			if(ticksInUse == 0) caster.playSound(WizardrySounds.SPELL_SUMMONING, 1.0F, 0.6f);
-			caster.playSound(WizardrySounds.SPELL_LOOP_CRACKLE, 2.0F, 1.0f);
-		}
+			
+			if(ticksInUse % 18 == 0){
+				if(ticksInUse == 0) caster.playSound(WizardrySounds.SPELL_SUMMONING, 1.0F, 0.6f);
+				caster.playSound(WizardrySounds.SPELL_LOOP_CRACKLE, 2.0F, 1.0f);
+			}
 
-		return true;
+			return true;
+		}
+		
+		return false;
 	}
 
 	@Override