From 4da263dead5e0dc4acf4da2003e0b174be81b445 Mon Sep 17 00:00:00 2001 From: Tkdrg Date: Sun, 29 Nov 2015 17:31:19 -0300 Subject: [PATCH] Fixes jobban_isbanned() runtime Fixes runtime with ckey-less mobs. --- code/modules/admin/banjob.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/admin/banjob.dm b/code/modules/admin/banjob.dm index d3eede9153b..3910310caa7 100644 --- a/code/modules/admin/banjob.dm +++ b/code/modules/admin/banjob.dm @@ -1,9 +1,9 @@ //returns a reason if M is banned from rank, returns 0 otherwise /proc/jobban_isbanned(mob/M, rank) - if(!M || !istype(M)) + if(!M || !istype(M) || !M.ckey) return 0 - if(!M.client && M.ckey) //no cache. fallback to a DBQuery + if(!M.client) //no cache. fallback to a DBQuery var/DBQuery/query = dbcon.NewQuery("SELECT reason FROM [format_table_name("ban")] WHERE ckey = '[sanitizeSQL(M.ckey)]' AND job = '[sanitizeSQL(rank)]' AND (bantype = 'JOB_PERMABAN' OR (bantype = 'JOB_TEMPBAN' AND expiration_time > Now())) AND isnull(unbanned)") if(!query.Execute()) log_game("SQL ERROR obtaining jobbans. Error : \[[query.ErrorMsg()]\]\n")