Trivia plugin: revert refactor, keep working updates

i.e. fix what I broke in https://github.com/Zarel/Pokemon-Showdown/pull/1307
I'll do the refactor gradually over time instead of all at once so I can keep track of where bugs are introduceds and fix them more easily when they show up.