From 03554f0aa1710130b476234353ed15cc744e26d0 Mon Sep 17 00:00:00 2001 From: Kyle Spier-Swenson Date: Sat, 22 Jun 2019 12:30:26 -0700 Subject: [PATCH] Moves the asset cache bug check to below the topic limiter While we were looking at logs to try and figure out how someone has been crashing the servers, oranges pointed out to me that these lines aren't below the topic limiter or the logger. The main asset cache stuff should be above it so legit asset cache sends don't eat up the user's topic limit, but this line can be below it and doing so should protect the user from getting spammed with asset cache browser resets whenever that one bug happens. (I also looked at logs, and the bug this code works around does still seem to be a thing.) --- code/modules/client/client_procs.dm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index 89b599ca177..b1d06cb083c 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -44,9 +44,6 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( if (job > 0 && job <= last_asset_job && !(job in completed_asset_jobs)) completed_asset_jobs += job return - else if (job in completed_asset_jobs) //byond bug ID:2256651 - to_chat(src, "An error has been detected in how your client is receiving resources. Attempting to correct.... (If you keep seeing these messages you might want to close byond and reconnect)") - src << browse("...", "window=asset_cache_browser") var/mtl = CONFIG_GET(number/minute_topic_limit) if (!holder && mtl) @@ -83,6 +80,11 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( //Logs all hrefs, except chat pings if(!(href_list["_src_"] == "chat" && href_list["proc"] == "ping" && LAZYLEN(href_list) == 2)) log_href("[src] (usr:[usr]\[[COORD(usr)]\]) : [hsrc ? "[hsrc] " : ""][href]") + + //byond bug ID:2256651 + if (href_list["asset_cache_confirm_arrival"] && href_list["asset_cache_confirm_arrival"] in completed_asset_jobs) + to_chat(src, "An error has been detected in how your client is receiving resources. Attempting to correct.... (If you keep seeing these messages you might want to close byond and reconnect)") + src << browse("...", "window=asset_cache_browser") // Admin PM if(href_list["priv_msg"])