As when you switch or lose targets your combo points should be hidden until the same target is regained. Right now it only reacts to UNIT_COMBO_POINTS.

It may also need to react to any or all of these too: "UNIT_ENTERED_VEHICLE UNIT_ENTERING_VEHICLE UNIT_EXITED_VEHICLE UNIT_EXITING_VEHICLE"

As you already have the check for vehicles that can make combo points but don't switch.

Current Branches: ALL

Solved with 83e11dd.

Good call on PLAYER_TARGET_UPDATE instead of UNIT_TARGET. I forgot about that old event.