Merge pull request #6548 from Meghan-Rossi/paifix

Fix pAI preferences not loading
This commit is contained in:
Anewbe
2019-11-29 19:48:45 -05:00
committed by VirgoBot
parent b1e5b169e2
commit 1de75f06bf

View File

@@ -7,11 +7,16 @@
/datum/category_item/player_setup_item/player_global/pai/load_preferences(var/savefile/S) /datum/category_item/player_setup_item/player_global/pai/load_preferences(var/savefile/S)
if(!candidate) if(!candidate)
candidate = new() candidate = new()
var/preference_mob = preference_mob()
if(!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 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) /datum/category_item/player_setup_item/player_global/pai/save_preferences(var/savefile/S)
if(!candidate) if(!candidate)