Merge pull request #234 from LetterJay/master

fix character switching bug
2017-02-17 15:47:53 -05:00
parent 8af261f46c 8066422c75
commit ee42eab64f
1 changed files with 2 additions and 0 deletions
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -207,6 +207,8 @@ var/next_external_rsc = 0
 	if(!prefs)
 		prefs = new /datum/preferences(src)
 		preferences_datums[ckey] = prefs
+	else
+		prefs.parent = src
 	prefs.last_ip = address				//these are gonna be used for banning
 	prefs.last_id = computer_id			//these are gonna be used for banning
 	if(world.byond_version >= 511 && byond_version >= 511 && prefs.clientfps)