From 1de75f06bffaf22ff31161cec466a3a0e0d0f634 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Fri, 29 Nov 2019 19:48:45 -0500 Subject: [PATCH] Merge pull request #6548 from Meghan-Rossi/paifix Fix pAI preferences not loading --- code/modules/client/preference_setup/global/03_pai.dm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/code/modules/client/preference_setup/global/03_pai.dm b/code/modules/client/preference_setup/global/03_pai.dm index 8e0b4ea8a5..01c5f7a850 100644 --- a/code/modules/client/preference_setup/global/03_pai.dm +++ b/code/modules/client/preference_setup/global/03_pai.dm @@ -7,11 +7,16 @@ /datum/category_item/player_setup_item/player_global/pai/load_preferences(var/savefile/S) if(!candidate) candidate = new() - - if(!preference_mob()) + var/preference_mob = preference_mob() + if(!preference_mob)// No preference mob - this happens when we're called from client/New() before it calls ..() (via datum/preferences/New()) + spawn() + preference_mob = preference_mob() + if(!preference_mob) + return + candidate.savefile_load(preference_mob) return - candidate.savefile_load(preference_mob()) + candidate.savefile_load(preference_mob) /datum/category_item/player_setup_item/player_global/pai/save_preferences(var/savefile/S) if(!candidate)