Merge branch 'main' into blocks-metadata

This commit is contained in:
MihailRis
2024-09-19 14:51:47 +03:00
73 changed files with 1866 additions and 1730 deletions
+3 -4
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;