voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-08 04:21:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge branch 'main' into blocks-metadata

Browse source
This commit is contained in:
MihailRis 2024-09-19 14:51:47 +03:00
commit 28b6ec2a0e
73 changed files with 1866 additions and 1730 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/objects/Player.hpp
View file

@ -4,7 +4,6 @@
#include <memory>
#include <optional>
#include "data/dynamic.hpp"
#include "interfaces/Object.hpp"
#include "interfaces/Serializable.hpp"
#include "settings.hpp"
@ -103,10 +102,10 @@ public:
void setSpawnPoint(glm::vec3 point);
glm::vec3 getSpawnPoint() const;
std::unique_ptr<dynamic::Map> serialize() const override;
void deserialize(dynamic::Map* src) override;
dv::value serialize() const override;
void deserialize(const dv::value& src) override;
static void convert(dynamic::Map* data, const ContentReport* report);
static void convert(dv::value& data, const ContentReport* report);
inline int getId() const {
return objectUID;