Fix more bugs in game logic.

Created by  Fabian Neumann  on February 1, 2018
ZKHZR46YYWJWHJIWH2ZCU4PVPVIEYK4IMAL4PQF6P4G3H7T36OPQC
Change contents