From c06c6c6a05123b36955f6b669076f119c04be6d6 Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Mon, 4 Feb 2019 22:09:36 +0200
Subject: [PATCH] Fixed gems dropping an item of the wrong affinity

---
 .../com/minelittlepony/unicopia/entity/EntitySpell.java  | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/minelittlepony/unicopia/entity/EntitySpell.java b/src/main/java/com/minelittlepony/unicopia/entity/EntitySpell.java
index b2f07d26..61ab417f 100644
--- a/src/main/java/com/minelittlepony/unicopia/entity/EntitySpell.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/EntitySpell.java
@@ -18,6 +18,7 @@ import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.SoundEvents;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.network.datasync.DataParameter;
@@ -99,11 +100,15 @@ public class EntitySpell extends EntityLiving implements IMagicals, ICaster<Enti
 	}
 
 	public ItemStack onPlayerMiddleClick(EntityPlayer player) {
-	    ItemStack stack = new ItemStack(UItems.spell, 1);
+	    ItemStack stack = new ItemStack(getItem(), 1);
 	    SpellRegistry.instance().enchantStack(stack, getEffect().getName());
 		return stack;
 	}
 
+	protected Item getItem() {
+	    return getAffinity() == SpellAffinity.BAD ? UItems.curse : UItems.spell;
+	}
+
 	@Override
     protected boolean canTriggerWalking() {
 	    return false;
@@ -226,7 +231,7 @@ public class EntitySpell extends EntityLiving implements IMagicals, ICaster<Enti
 		if (world.getGameRules().getBoolean("doTileDrops")) {
 			int level = getCurrentLevel();
 
-			ItemStack stack = new ItemStack(UItems.spell, level + 1);
+			ItemStack stack = new ItemStack(getItem(), level + 1);
 			if (hasEffect()) {
 			    SpellRegistry.instance().enchantStack(stack, getEffect().getName());
 			}