Players are able to Riptide without calling PlayerRiptideEvent [Reopened from #11676]

Expected behavior

Player riptides and swaps to another item, animation still appears and PlayerRiptideEvent is called.

Observed/Actual behavior

Player riptides and swaps to another item, no animation appears, and PlayerRiptideEvent is not called, however their character is as if they did Riptide.

Specifically, pressing the offhand key as the player riptides circumvents whatever 'fix' someone added for this.

Steps/models to reproduce

1. Get trident with riptide
2. Go in water, hold down right click
3. Release, and press key to transfer to offhand (default is F)

Plugin and Datapack List

N/A

Paper version

This server is running Paper version 1.21.7-9-main@5661fbb (2025-06-30T19:43:31Z) (Implementing API version 1.21.7-R0.1-SNAPSHOT) You are running the latest version Previous version: 1.21.4-106-ab1b312 (MC: 1.21.4)

Other

https://github.com/PaperMC/Paper/issues/11676