Merge branch '1.12.2' into 1.12.2-dev

src/main/java/electroblob/wizardry/entity/living/EntitySpiritWolf.java

@@ -25,6 +25,7 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.DamageSource;
 import net.minecraft.util.EnumHand;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.TextComponentTranslation;
 import net.minecraft.world.DifficultyInstance;
@@ -71,11 +72,6 @@ public class EntitySpiritWolf extends EntityWolf {
 		super.onDeath(source);
 	}
 
-	@Override
-	protected int getExperiencePoints(EntityPlayer p_70693_1_){
-		return 0;
-	}
-
 	@Override
 	public IEntityLivingData onInitialSpawn(DifficultyInstance difficulty, IEntityLivingData livingdata){
 
@@ -151,11 +147,26 @@ public class EntitySpiritWolf extends EntityWolf {
 		return null;
 	}
 
+	@Override
+	protected int getExperiencePoints(EntityPlayer player){
+		return 0;
+	}
+
+	@Override
+	protected boolean canDropLoot(){
+		return false;
+	}
+
 	@Override
 	protected Item getDropItem(){
 		return null;
 	}
 
+	@Override
+	protected ResourceLocation getLootTable(){
+		return null;
+	}
+
 	@Override
 	public ITextComponent getDisplayName(){
 		if(getOwner() != null){