From 2c8c2b45b699632022da65b4a472f13950761384 Mon Sep 17 00:00:00 2001 From: HellFirePvP <01ecs01m> Date: Wed, 4 Nov 2015 21:18:17 +0100 Subject: [PATCH] - Warpy warpy Familiars v2.0 --- .../common/items/baubles/ItemFamiliar.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/makeo/gadomancy/common/items/baubles/ItemFamiliar.java b/src/main/java/makeo/gadomancy/common/items/baubles/ItemFamiliar.java index 2b2550d..df3bc44 100644 --- a/src/main/java/makeo/gadomancy/common/items/baubles/ItemFamiliar.java +++ b/src/main/java/makeo/gadomancy/common/items/baubles/ItemFamiliar.java @@ -110,14 +110,6 @@ public class ItemFamiliar extends Item implements IBauble { if(itemStack == null) return; if(entity instanceof EntityPlayer && itemStack.getItem() instanceof ItemFamiliar) { Gadomancy.proxy.familiarHandler.equippedTick(((EntityPlayer) entity).worldObj, itemStack, (EntityPlayer) entity); - } - } - - @Override - public void onEquipped(ItemStack itemStack, EntityLivingBase entity) { - if(itemStack == null) return; - if(entity instanceof EntityPlayer && itemStack.getItem() instanceof ItemFamiliar) { - Gadomancy.proxy.familiarHandler.notifyEquip(((EntityPlayer) entity).worldObj, itemStack, (EntityPlayer) entity); if(((EntityPlayer) entity).worldObj.isRemote) return; @@ -133,6 +125,14 @@ public class ItemFamiliar extends Item implements IBauble { } } + @Override + public void onEquipped(ItemStack itemStack, EntityLivingBase entity) { + if(itemStack == null) return; + if(entity instanceof EntityPlayer && itemStack.getItem() instanceof ItemFamiliar) { + Gadomancy.proxy.familiarHandler.notifyEquip(((EntityPlayer) entity).worldObj, itemStack, (EntityPlayer) entity); + } + } + @Override public void onUnequipped(ItemStack itemStack, EntityLivingBase entity) { if(itemStack == null) return;