From a9335aa94627a3b757842f0972cbc607cb79ab2f Mon Sep 17 00:00:00 2001
From: Ghommie <42542238+Ghommie@users.noreply.github.com>
Date: Sun, 8 Dec 2019 13:21:29 +0100
Subject: [PATCH] Fixes a long lasting runtime with filter data sorting.

---
 code/__HELPERS/cmp.dm | 3 +++
 code/game/atoms.dm    | 5 ++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/code/__HELPERS/cmp.dm b/code/__HELPERS/cmp.dm
index 87f3a32b0d..f7131e63fa 100644
--- a/code/__HELPERS/cmp.dm
+++ b/code/__HELPERS/cmp.dm
@@ -23,6 +23,9 @@ GLOBAL_VAR_INIT(cmp_field, "name")
 /proc/cmp_records_dsc(datum/data/record/a, datum/data/record/b)
 	return sorttext(a.fields[GLOB.cmp_field], b.fields[GLOB.cmp_field])
 
+/proc/cmp_filter_data_priority(list/A, list/B)
+	return A["priority"] - B["priority"]
+
 /proc/cmp_ckey_asc(client/a, client/b)
 	return sorttext(b.ckey, a.ckey)
 
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index 2fe5380490..7de5707032 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -809,8 +809,7 @@ Proc for attack log creation, because really why not
 
 // Filter stuff
 /atom/movable/proc/add_filter(name,priority,list/params)
-	if(!filter_data)
-		filter_data = list()
+	LAZYINITLIST(filter_data)
 	var/list/p = params.Copy()
 	p["priority"] = priority
 	filter_data[name] = p
@@ -818,7 +817,7 @@ Proc for attack log creation, because really why not
 
 /atom/movable/proc/update_filters()
 	filters = null
-	sortTim(filter_data,associative = TRUE)
+	filter_data = sortTim(filter_data, /proc/cmp_filter_data_priority, TRUE)
 	for(var/f in filter_data)
 		var/list/data = filter_data[f]
 		var/list/arguments = data.Copy()