Revert "Minor map bugs"
Revert "Minor map bugs"

This reverts commit 3cdcff5803ddbe09c9aecccb945d79f90fbc83b8.

ZomgPonies/Paradise64,ZomgPonies/Paradise64,ZomgPonies/Paradise64,ZomgPonies/Paradise64,ZomgPonies/Paradise64,ZomgPonies/Paradise64