Moved setItemInHand(ItemStack) to before item adds

Will avoid overwriting items