From d139c68227941435e40f6ddd2d52f6fc10eb7caf Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Mon, 29 Jul 2019 00:51:44 +0200 Subject: [PATCH 1/2] Fixes the advanced pinpointer crashing the server --- code/game/gamemodes/nuclear/pinpointer.dm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm index bfc30780b81..562e605f31d 100644 --- a/code/game/gamemodes/nuclear/pinpointer.dm +++ b/code/game/gamemodes/nuclear/pinpointer.dm @@ -165,10 +165,13 @@ var/targetitem = input("Select item to search for.", "Item Mode Select","") as null|anything in item_names if(!targetitem) return - var/list/obj/item/target_candidates = get_all_of_type(item_paths[targetitem], subtypes = TRUE) - for(var/obj/item/candidate in target_candidates) - if(!is_admin_level(candidate.loc.z)) - target = candidate + + var/list/target_candidates = get_all_of_type(item_paths[targetitem], subtypes = TRUE) + for(var/obj/item/candidate in target_candidates) + if(!is_admin_level(candidate.loc.z)) + target = candidate + break + if(!target) to_chat(usr, "Failed to locate [targetitem]!") return From 5847c9f5c6063932e4d4d3a55a8357f7a1cad52c Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Mon, 29 Jul 2019 01:04:14 +0200 Subject: [PATCH 2/2] turf instead of the plain Z --- code/game/gamemodes/nuclear/pinpointer.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm index 562e605f31d..07ee2219157 100644 --- a/code/game/gamemodes/nuclear/pinpointer.dm +++ b/code/game/gamemodes/nuclear/pinpointer.dm @@ -168,7 +168,7 @@ var/list/target_candidates = get_all_of_type(item_paths[targetitem], subtypes = TRUE) for(var/obj/item/candidate in target_candidates) - if(!is_admin_level(candidate.loc.z)) + if(!is_admin_level((get_turf(candidate)).z)) target = candidate break