cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-21 04:57:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #44748 from tgstation/MrStonedOne-asset-cache-line-move

Browse Source 
Moves the asset cache bug check to below the topic limiter
This commit is contained in:
oranges
2019-06-23 08:29:22 +12:00
committed by GitHub
parent 8d30066149 03554f0aa1
commit 2522037c8e
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/client_procs.dm
+5 -3
View File
@@ -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, "<span class='danger'>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)</span>")
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, "<span class='danger'>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)</span>")
src << browse("...", "window=asset_cache_browser")
// Admin PM
if(href_list["priv_msg"])