Merge branch '1.12.2' into 1.12.2-dev

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

@@ -18,6 +18,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.util.text.translation.I18n;
@@ -52,13 +53,22 @@ public class EntitySpiritHorse extends EntityHorse {
 	}
 
 	@Override
-	protected int getExperiencePoints(EntityPlayer p_70693_1_){
+	protected int getExperiencePoints(EntityPlayer player){
 		return 0;
 	}
 
 	@Override
-	protected Item getDropItem(){
+	protected boolean canDropLoot(){
+		return false;
+	}
 
+	@Override
+	protected Item getDropItem(){
+		return null;
+	}
+
+	@Override
+	protected ResourceLocation getLootTable(){
 		return null;
 	}