diff --git a/include/bedrock/network/protocol/game/start_game_packet.h b/include/bedrock/network/protocol/game/start_game_packet.h index 009914289..7a4e6ddf8 100644 --- a/include/bedrock/network/protocol/game/start_game_packet.h +++ b/include/bedrock/network/protocol/game/start_game_packet.h @@ -42,9 +42,9 @@ class StartGamePacket : public Packet { private: mutable LevelSettings settings_; // +48 - ActorUniqueID entity_id_; // +1296 - ActorRuntimeID runtime_id_; // +1304 - GameType game_type_; // +1312 + ActorUniqueID entity_id_; // +1296 (+1072) + ActorRuntimeID runtime_id_; // +1304 (+1080) + GameType game_type_; // +1312 (+1088) Vec3 position_; // +1316 Vec2 rotation_; // +1328 std::string level_id_; // +1336 @@ -61,8 +61,8 @@ class StartGamePacket : public Packet { std::string server_version_; // +1536 CompoundTag player_property_data_; // +1568 std::uint64_t server_block_type_registry_checksum_; // +1592 - bool server_enabled_client_side_generation_; // +1600 - bool block_network_ids_are_hashes_; // +1601 - NetworkPermissions network_permissions_; // +1602 - std::vector> block_properties_; // +1608 + bool server_enabled_client_side_generation_; // +1600 (+1352) + bool block_network_ids_are_hashes_; // +1601 (+1353) + NetworkPermissions network_permissions_; // +1602 (+1354) + std::vector> block_properties_; // +1608 (+1360) }; diff --git a/include/bedrock/world/level/storage/level_settings.h b/include/bedrock/world/level/storage/level_settings.h index 8f3842c79..858655b93 100644 --- a/include/bedrock/world/level/storage/level_settings.h +++ b/include/bedrock/world/level/storage/level_settings.h @@ -26,7 +26,7 @@ class LevelSettings { void setRandomSeed(LevelSeed64 seed) { - seed_ = std::move(seed); + seed_ = seed; } private: @@ -34,7 +34,7 @@ class LevelSettings { #ifdef _WIN32 size_t pad_[1248 / 8 - 1]; #else - size_t pad_[1072 / 8 - 1]; + size_t pad_[1024 / 8 - 1]; #endif }; -BEDROCK_STATIC_ASSERT_SIZE(LevelSettings, 1248, 1072); +BEDROCK_STATIC_ASSERT_SIZE(LevelSettings, 1248, 1024);