Fix /triviaend and /triviakick
Merge pull request #1280 from Morfent/trivia

Fix /triviaend and /triviakick