From 346581e23dc00fd16c650cc1d531c21bbc8e5f8f Mon Sep 17 00:00:00 2001 From: Hubry Date: Sun, 8 Dec 2019 19:50:19 +0100 Subject: [PATCH] Fix lexicon share crashing if you don't have the lexicon in main hand --- .../java/vazkii/botania/common/item/ItemLexicon.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index fa9450594..5e81d36df 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -192,12 +192,16 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { } @Override - public void onUpdate(ItemStack stack, World world, Entity entity, int idk, boolean something) { + public void onUpdate(ItemStack stack, World world, Entity entity, int slot, boolean selected) { int ticks = getQueueTicks(stack); if(ticks > 0 && entity instanceof EntityPlayer) { skipSound = ticks < 5; - if(ticks == 1) - onItemRightClick(world, (EntityPlayer) entity, EnumHand.MAIN_HAND); + if(ticks == 1) { + if(selected) + onItemRightClick(world, (EntityPlayer) entity, EnumHand.MAIN_HAND); + else if(stack == ((EntityPlayer) entity).getHeldItemOffhand()) + onItemRightClick(world, (EntityPlayer) entity, EnumHand.OFF_HAND); + } setQueueTicks(stack, ticks - 1); }