mirror of
https://github.com/GTNewHorizons/Gadomancy.git
synced 2026-11-20 20:12:16 +00:00
Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
93d532757f
1 file changed
+8
-8
@@ -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;
|
||||
|
||||
Reference in new issue
Block a user