Remove more block ID usage
Prevent Lockette exploits
Prevent autonomous travel to TARDIS creation area
Merge branch 'v3.0' into v3.1_WG6