fixes rejects

2017-05-07 22:24:26 -07:00
parent 5d2f131d07
commit 48d9e2e349
4 changed files with 104 additions and 122 deletions
@@ -114,6 +114,9 @@ SUBSYSTEM_DEF(persistence)
 	var/saved_json
 	trophy_sav >> saved_json

+	if(!saved_json)
+		return
+
 	var/decoded_json = json_decode(saved_json)

 	if(!islist(decoded_json))
@@ -1,11 +0,0 @@
-diff a/code/controllers/subsystem/persistence.dm b/code/controllers/subsystem/persistence.dm	(rejected hunks)
-@@ -114,6 +114,9 @@ SUBSYSTEM_DEF(persistence)
- 	var/saved_json
- 	trophy_sav >> saved_json
- 
-+	if(!saved_json)
-+		return
-+
- 	var/decoded_json = json_decode(saved_json)
- 
- 	if(!islist(decoded_json))