Changed trading mechanism in GameController to match the behaviour of Trade