diff --git a/src/main/java/electroblob/wizardry/entity/projectile/EntityMagicProjectile.java b/src/main/java/electroblob/wizardry/entity/projectile/EntityMagicProjectile.java
index 2fc51736..ee5bef3f 100644
--- a/src/main/java/electroblob/wizardry/entity/projectile/EntityMagicProjectile.java
+++ b/src/main/java/electroblob/wizardry/entity/projectile/EntityMagicProjectile.java
@@ -1,5 +1,7 @@
 package electroblob.wizardry.entity.projectile;
 
+import java.util.List;
+
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.projectile.EntityThrowable;
@@ -42,8 +44,8 @@ public abstract class EntityMagicProjectile extends EntityThrowable {
 		this.damageMultiplier = damageMultiplier;
 	}
 
-	public EntityMagicProjectile(World par1World, double par2, double par4, double par6){
-		super(par1World, par2, par4, par6);
+	public EntityMagicProjectile(World world, double x, double y, double z){
+		super(world, x, y, z);
 	}
 
 	/** This got removed at some point since 1.7.10, but I liked it so I thought I'd add it back in again. */
@@ -63,6 +65,33 @@ public abstract class EntityMagicProjectile extends EntityThrowable {
 		this.motionY = dy / this.getDistanceToEntity(target) * velocity;
 		this.motionZ = dz / this.getDistanceToEntity(target) * velocity;
 	}
+	
+	@Override
+	public void onUpdate(){
+		// This fixes the client-side projectile-hitting-thrower bug. Comparing with 1.10.2, this was caused by a change
+		// to the line EntityThrowable:215, where a thrower != null check was added. Since the thrower field is not synced,
+		// this fails and the ignoreEntity field is never set, causing the projectile to hit its thrower client-side.
+		// The 'proper' way to fix this is to use IEntityAdditionalSpawnData to sync the thrower field, but I don't really
+		// want to waste packets like that, so, since things worked just fine in 1.10.2 without the thrower != null check,
+		// it makes sense to just duplicate that block of code and remove the offending check.
+		// The only side-effect (and probably why the change was made to vanilla) is that if this entity is summoned
+		// inside a mob using commands, it wouldn't hit that mob. This is so minor that it's not worth sending a packet
+		// for, though it may become more noticeable if spells firing from blocks are added.
+		// TODO: Investigate whether this is still necessary in 1.12
+		if(this.world.isRemote){
+			
+			List<Entity> list = this.world.getEntitiesWithinAABBExcludingEntity(this, this.getEntityBoundingBox().expand(this.motionX, this.motionY, this.motionZ).grow(1.0D));
+	        
+			for(Entity entity : list){ // Why does vanilla still not use a for-each loop?
+	            if(entity.canBeCollidedWith() && this.ticksExisted < 2 && this.ignoreEntity == null){
+	            	this.ignoreEntity = entity;
+	            }
+	        }
+			// Pretty sure EntityThrowable handles the rest.
+		}
+		
+		super.onUpdate();
+	}
 
 	@Override
 	public void readEntityFromNBT(NBTTagCompound nbttagcompound){
diff --git a/src/main/java/electroblob/wizardry/entity/projectile/EntityThunderbolt.java b/src/main/java/electroblob/wizardry/entity/projectile/EntityThunderbolt.java
index 85624014..48e2a4d0 100644
--- a/src/main/java/electroblob/wizardry/entity/projectile/EntityThunderbolt.java
+++ b/src/main/java/electroblob/wizardry/entity/projectile/EntityThunderbolt.java
@@ -38,6 +38,7 @@ public class EntityThunderbolt extends EntityMagicProjectile {
 	 * Called when this EntityThrowable hits a block or entity.
 	 */
 	protected void onImpact(RayTraceResult par1RayTraceResult){
+		
 		Entity entityHit = par1RayTraceResult.entityHit;
 
 		if(entityHit != null){