diff --git a/src/com/spiteful/forbidden/FMEventHandler.java b/src/com/spiteful/forbidden/FMEventHandler.java index db87cff..2ef1cb4 100644 --- a/src/com/spiteful/forbidden/FMEventHandler.java +++ b/src/com/spiteful/forbidden/FMEventHandler.java @@ -241,7 +241,8 @@ public class FMEventHandler imprintCrystal((EntityPlayer)(event.source.getEntity()), name); } - if(EnchantmentHelper.getEnchantmentLevel(DarkEnchantments.educational.effectId, equip) > 0 && event.entityLiving instanceof EntityLiving) + if(EnchantmentHelper.getEnchantmentLevel(DarkEnchantments.educational.effectId, equip) > 0 && event.entityLiving instanceof EntityLiving + && EnchantmentHelper.getEnchantmentLevel(Enchantment.looting.effectId, equip) == 0) { int learning = 3 * ((EntityLiving)event.entityLiving).experienceValue * EnchantmentHelper.getEnchantmentLevel(DarkEnchantments.educational.effectId, equip); while(learning > 0) diff --git a/src/com/spiteful/forbidden/enchantments/EnchantmentEducational.java b/src/com/spiteful/forbidden/enchantments/EnchantmentEducational.java index a846b4c..b4f09f1 100644 --- a/src/com/spiteful/forbidden/enchantments/EnchantmentEducational.java +++ b/src/com/spiteful/forbidden/enchantments/EnchantmentEducational.java @@ -30,7 +30,7 @@ public class EnchantmentEducational extends Enchantment */ public boolean canApplyTogether(Enchantment ench) { - return super.canApplyTogether(ench) && ench.effectId != Enchantment.looting.effectId; + return super.canApplyTogether(ench) && ench.effectId != Enchantment.looting.effectId && ench.effectId != DarkEnchantments.greedy.effectId; } @Override diff --git a/src/com/spiteful/forbidden/enchantments/EnchantmentGreedy.java b/src/com/spiteful/forbidden/enchantments/EnchantmentGreedy.java index f88b215..ddc5d32 100644 --- a/src/com/spiteful/forbidden/enchantments/EnchantmentGreedy.java +++ b/src/com/spiteful/forbidden/enchantments/EnchantmentGreedy.java @@ -46,7 +46,7 @@ public class EnchantmentGreedy extends Enchantment */ public boolean canApplyTogether(Enchantment ench) { - return super.canApplyTogether(ench) && ench.effectId != Enchantment.looting.effectId; + return super.canApplyTogether(ench) && ench.effectId != Enchantment.looting.effectId && ench.effectId != DarkEnchantments.educational.effectId; } @Override