mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-10-07 03:51:50 +00:00
Merge branch 'main' into blocks-metadata
This commit is contained in:
commit
28b6ec2a0e
73 changed files with 1866 additions and 1730 deletions
|
|
@ -7,7 +7,6 @@
|
|||
|
||||
#include "content/ContentReport.hpp"
|
||||
#include "files/compatibility.hpp"
|
||||
#include "data/dynamic.hpp"
|
||||
#include "debug/Logger.hpp"
|
||||
#include "files/files.hpp"
|
||||
#include "objects/Player.hpp"
|
||||
|
|
@ -184,8 +183,8 @@ void WorldConverter::convertInventories(const fs::path& file, int x, int z) cons
|
|||
void WorldConverter::convertPlayer(const fs::path& file) const {
|
||||
logger.info() << "converting player " << file.u8string();
|
||||
auto map = files::read_json(file);
|
||||
Player::convert(map.get(), report.get());
|
||||
files::write_json(file, map.get());
|
||||
Player::convert(map, report.get());
|
||||
files::write_json(file, map);
|
||||
}
|
||||
|
||||
void WorldConverter::convert(const ConvertTask& task) const {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue