From 0c3126ffad5eb7cbb6778dd6a180d84876705b37 Mon Sep 17 00:00:00 2001 From: Leshana Date: Fri, 10 Apr 2020 09:45:57 -0400 Subject: [PATCH] Fix overmap spacemove not actually re-using deepspace sectors. --- code/modules/overmap/spacetravel.dm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/code/modules/overmap/spacetravel.dm b/code/modules/overmap/spacetravel.dm index aec5c06f75c..a51cfc3f6de 100644 --- a/code/modules/overmap/spacetravel.dm +++ b/code/modules/overmap/spacetravel.dm @@ -29,14 +29,16 @@ var/list/cached_space = list() return 1 proc/get_deepspace(x,y) - var/obj/effect/overmap/visitable/sector/temporary/res = locate(x,y,global.using_map.overmap_z) + var/turf/unsimulated/map/overmap_turf = locate(x,y,global.using_map.overmap_z) + if(!istype(overmap_turf)) + CRASH("Attempt to get deepspace at ([x],[y]) which is not on overmap: [overmap_turf]") + var/obj/effect/overmap/visitable/sector/temporary/res = locate() in overmap_turf if(istype(res)) return res else if(cached_space.len) res = cached_space[cached_space.len] cached_space -= res - res.x = x - res.y = y + res.forceMove(overmap_turf) return res else return new /obj/effect/overmap/visitable/sector/temporary(x, y, global.using_map.get_empty_zlevel()) @@ -110,5 +112,5 @@ proc/overmap_spacetravel(var/turf/space/T, var/atom/movable/A) var/obj/effect/overmap/visitable/sector/temporary/source = M if (source.can_die()) testing("Caching [M] for future use") - source.loc = null + source.moveToNullspace() cached_space += source