From 213f6b805b64c0499c631df702413d46d3deed3a Mon Sep 17 00:00:00 2001 From: adamsong Date: Wed, 13 Apr 2022 02:05:11 -0500 Subject: [PATCH 1/2] Fixes runtime in keyloop triggered by Baiomu --- yogstation/code/modules/keybindings/bindings_client.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yogstation/code/modules/keybindings/bindings_client.dm b/yogstation/code/modules/keybindings/bindings_client.dm index ba1bef5f1e18..111c7025f195 100644 --- a/yogstation/code/modules/keybindings/bindings_client.dm +++ b/yogstation/code/modules/keybindings/bindings_client.dm @@ -84,5 +84,5 @@ /client/keyLoop() if(holder) holder.keyLoop(src) - if(mob.focus) + if(mob?.focus) mob.focus.keyLoop(src) From b26b702f8f04e75650fedf0eca79b78d6be66948 Mon Sep 17 00:00:00 2001 From: adamsong Date: Wed, 13 Apr 2022 02:06:38 -0500 Subject: [PATCH 2/2] Adds check in a couple other places --- yogstation/code/modules/keybindings/bindings_client.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yogstation/code/modules/keybindings/bindings_client.dm b/yogstation/code/modules/keybindings/bindings_client.dm index 111c7025f195..40116ef4ba95 100644 --- a/yogstation/code/modules/keybindings/bindings_client.dm +++ b/yogstation/code/modules/keybindings/bindings_client.dm @@ -49,7 +49,7 @@ if(holder) holder.key_down(I, src) - if(mob.focus) + if(mob?.focus) mob.focus.key_down(I, src) /client/verb/keyUp(_key as text) @@ -77,7 +77,7 @@ if(holder) holder.key_up(I, src) - if(mob.focus) + if(mob?.focus) mob.focus.key_up(I, src) // Called every game tick