h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-12 23:12:56 +08:00
Code Issues Releases Wiki Activity

Fix incorrect reference + simplify

Browse Source
This commit is contained in:
smoogipoo 2020-06-03 17:41:05 +09:00
parent 8aa8d2c880
commit 092f5b6521
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/IO/Serialization/Converters/TypedListConverter.cs
View File

@ -42,24 +42,24 @@ namespace osu.Game.IO.Serialization.Converters
var obj = JObject.Load(reader); var obj = JObject.Load(reader);
if (!obj.TryGetValue("$lookup_table", out var lookupTableToken) || lookupTableToken == null) if (obj["$lookup_table"] == null)
return list; return list;
var lookupTable = serializer.Deserialize<List<string>>(lookupTableToken.CreateReader()); var lookupTable = serializer.Deserialize<List<string>>(obj["$lookup_table"].CreateReader());
if (lookupTable == null) if (lookupTable == null)
return list; return list;
if (!obj.TryGetValue("$items", out var itemsToken) || itemsToken == null) if (obj["$items"] == null)
return list; return list;
foreach (var tok in itemsToken) foreach (var tok in obj["$items"])
{ {
var itemReader = tok.CreateReader(); var itemReader = tok.CreateReader();
if (!obj.TryGetValue("$type", out var typeToken) || typeToken == null) if (tok["$type"] == null)
throw new JsonException("Expected $type token."); throw new JsonException("Expected $type token.");
var typeName = lookupTable[(int)typeToken]; var typeName = lookupTable[(int)tok["$type"]];
var instance = (T)Activator.CreateInstance(Type.GetType(typeName)); var instance = (T)Activator.CreateInstance(Type.GetType(typeName));
serializer.Populate(itemReader, instance); serializer.Populate(itemReader, instance);