Update entity serialization for bevy v0.13

src/client.rs

@@ -453,14 +453,15 @@ fn apply_update_components(
 
 /// Deserializes `entity` from compressed index and generation.
 ///
-/// For details see [`ReplicationBuffer::write_entity`](crate::server::replication_message::replication_buffer::write_entity).
+/// For details see
+/// [`ReplicationBuffer::write_entity`](crate::server::replication_message::replication_buffer::write_entity).
 fn deserialize_entity(cursor: &mut Cursor<&[u8]>) -> bincode::Result<Entity> {
     let flagged_index: u64 = cursor.read_u64_varint()?;
     let has_generation = (flagged_index & 1) > 0;
     let generation = if has_generation {
-        cursor.read_u32_varint()?
+        cursor.read_u32_varint()? + 1
     } else {
-        0u32
+        1u32
     };
 
     let bits = (generation as u64) << 32 | (flagged_index >> 1);

src/server/replication_messages.rs

@@ -674,15 +674,17 @@ fn can_pack(header_size: usize, base: usize, add: usize) -> bool {
 /// Serializes `entity` by writing its index and generation as separate varints.
 ///
 /// The index is first prepended with a bit flag to indicate if the generation
-/// is serialized or not (it is not serialized if equal to zero).
+/// is serialized or not. It is not serialized if <= 1; note that generations are `NonZeroU32`
+/// and a value of zero is used in `Option<Entity>` to signify `None`, so generation 1 is the first
+/// generation.
 fn serialize_entity(cursor: &mut Cursor<Vec<u8>>, entity: Entity) -> bincode::Result<()> {
     let mut flagged_index = (entity.index() as u64) << 1;
-    let flag = entity.generation() > 0;
+    let flag = entity.generation() > 1;
     flagged_index |= flag as u64;
 
     cursor.write_u64_varint(flagged_index)?;
     if flag {
-        cursor.write_u32_varint(entity.generation())?;
+        cursor.write_u32_varint(entity.generation() - 1)?;
     }
 
     Ok(())