Disappearing Nametags and leads

[BoltyDawg]

Client doesn't update to get their nametage back upon getting their interact event cancelled when trying to name a horse without holding its deed. They appear to lose the nametag until updating that inventory slot, where it catches up to the server side. This might be a spigot issue but I'm confident I should be able to figure out a work-around.
Possible fix that comes to mind: remove the item from their inventory, then 1 tick later, give it back