v1.13: Simplify end of map detection

This should also resolve an undiagnosed bug that I couldn't recreate, where many random server setups would have map end detected while the current map was still ongoing