Merge branch 'master' of github.com:XenoWanderer/StarryPy into XenoWanderer-master

Author: AMorporkian

packets/packet_types.py

@@ -178,11 +178,8 @@ def _decode(self, obj, context):
 
 
 world_start = lambda name="world_start": Struct(name,
-                                                VLQ("planet_size"),
-                                                Bytes("planet", lambda ctx: ctx.planet_size),
-                                                VLQ("world_structure_size"),
-                                                Bytes("world_structure",
-                                                      lambda ctx: ctx.world_structure_size),
+                                                Variant("planet"),
+                                                Variant("world_structure"),
                                                 VLQ("sky_size"),
                                                 Bytes("sky",
                                                       lambda ctx: ctx.sky_size),
@@ -191,8 +188,8 @@ def _decode(self, obj, context):
                                                 BFloat32("spawn_x"),
                                                 BFloat32("spawn_y"),
                                                 update_world_properties("world_properties"),
-                                                SBInt32("unknown1"),
-                                                Flag("unknown2"))
+                                                UBInt32("client_id"),
+                                                Flag("local"))
 
 world_stop = lambda name="world_stop": Struct(name,
                                               star_string("status"))