cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-27 10:02:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix tutorials not reappearing in some cases (#83066)

Browse Source 
## About The Pull Request
client deletion isn't the only way to leave a mob
## Changelog
🆑
fix: fixed clients being seen as stuck doing tutorials in some cases
when changing mobs
/🆑

Co-authored-by: TiviPlus <572233640+TiviPlus@users.noreply.com>
This commit is contained in:
TiviPlus
2024-05-09 03:41:39 +02:00
committed by GitHub
parent f358423a1e
commit 2efd770f4f
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/modules/tutorials/_tutorial.dm
View File

@@ -13,8 +13,7 @@
/datum/tutorial/New(mob/user)
src.user = user
RegisterSignal(user, COMSIG_QDELETING, PROC_REF(destroy_self))
RegisterSignal(user.client, COMSIG_QDELETING, PROC_REF(destroy_self))
RegisterSignals(user, list(COMSIG_QDELETING, COMSIG_MOB_LOGOUT), PROC_REF(destroy_self))
/datum/tutorial/Destroy(force)
user.client?.screen -= instruction_screen
@@ -242,7 +241,13 @@
/// Dismisses the tutorial, not marking it as completed in the database.
/// Call `/datum/tutorial/proc/dismiss()` instead.
/datum/tutorial_manager/proc/dismiss(mob/user)
performing_ckeys -= user.ckey
// this can be null in some disconnect/mob logout cases so we use some fallbacks
var/user_ckey = user.ckey
if(!user_ckey && user.canon_client)
user_ckey = user.canon_client.ckey
if(!user_ckey && user.mind?.key)
user_ckey = ckey(user.mind.key)
performing_ckeys -= user_ckey
/// Given a ckey, will mark them as being completed without affecting the database.
/// Call `/datum/tutorial/proc/complete()` instead.