Potential fix for broken multiworld states.
Polish the fix from the last commit and straighten some other multiworld issues in the move handler.
Merge remote-tracking branch 'weteam/master' into WEteam