Fix collision behavior of Cup, and fix a crash in KolfGame dtor.

The crash fix introduces another crash when the game is closed, but
fixing the other crash is more important right now because it hindered
me from starting any games.