alemi/aiocraft
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

safer player/texture deserialize

Browse source
This commit is contained in:
əlemi 2022-05-05 10:43:39 +02:00
parent cde96c3cd5
commit d36772b94d
No known key found for this signature in database
GPG key ID: BBCBFE5D7244634E
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/aiocraft/mc/definitions.py
View file

@ -187,7 +187,11 @@ class Texture:
def deserialize(cls, data:Dict[str, Any]) -> 'Texture':
if "_" in data and data["_"] != cls.__name__:
raise ValueError(f"Cannot deserialize {data['_']} as {cls.__name__}")
return cls(**data)
return cls(
name=data["name"],
value=data["value"],
signature=data["signature"] if "signature" in data else None,
)
@dataclass
class Player:
@ -219,8 +223,14 @@ class Player:
def deserialize(cls, data:Dict[str, Any]) -> 'Player':
if "_" in data and data["_"] != cls.__name__:
raise ValueError(f"Cannot deserialize {data['_']} as {cls.__name__}")
if "joinTime" not in data:
data["joinTime"] = datetime(2011, 11, 18, 0, 0, 0)
data["properties"] = [ Texture.deserialize(t) for t in data["properties"] ]
return cls(**data)
return cls(
UUID=data["UUID"],
name=data["name"],
joinTime=data["joinTime"] if "joinTime" in data else datetime(2011, 11, 18, 0, 0, 0),
properties=[ Texture.deserialize(t) for t in data["properties"] ] \
if "properties" in data and data["properties"] else None,
gamemode=data["gamemode"],
ping=data["ping"],
displayName=data["displayName"] if "displayName" in data else None,
)