Fix attribute-swapping… a good way

Dear Mojang. In the last update (26.2 pre-3), you reverted the change to fix attribute swapping (MC-28289), but you said it was for *unrelated reasons*. As i understand, it will soonly be removed. Personally, im completly fine with attribute swapping fixed, but in 26.2 pre-2 there was a (forced, as i think) delay in switching slots where you cant use an item. I really would appreciate if you fix attribute swapping without breaking things. For example, X-bow does not use attribute swapping, however, it was slowed down in 26.2 pre-2. Thanks.