From 8c88446c686703317f150f2f0e0f136224b4cc30 Mon Sep 17 00:00:00 2001 From: SabreML <57483089+SabreML@users.noreply.github.com> Date: Sun, 17 Oct 2021 10:56:20 +0100 Subject: [PATCH] Attack log null `prefs` fix (#16959) --- code/modules/admin/admin.dm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index f065bbce187..794ca47df46 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -13,12 +13,8 @@ GLOBAL_VAR_INIT(nologevent, 0) if(!GLOB.nologevent) var/rendered = "ATTACK: [text]" for(var/client/C in GLOB.admins) - if(R_ADMIN & C.holder.rights) - if(C.prefs.atklog == ATKLOG_NONE) - continue - var/msg = rendered - if(C.prefs.atklog <= loglevel) - to_chat(C, msg) + if((C.holder.rights & R_ADMIN) && (C.prefs?.atklog <= loglevel)) + to_chat(C, rendered) /** * Sends a message to the staff able to see admin tickets