fix mvalue crash

altmp · Sep 11, 2023 · 3f35961 · 3f35961
1 parent 5b0f9be
commit 3f35961
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 1 deletion.
diff --git a/c-api/core.cpp b/c-api/core.cpp
@@ -354,7 +354,11 @@ alt::IVirtualEntity* Core_CreateVirtualEntity(alt::ICore* core, alt::IVirtualEnt
     std::unordered_map<std::string, alt::MValue> data = {};
 
     for (uint64_t i = 0; i < size; i++) {
-        data[keys[i]] = values[i]->get()->Clone();
+        if (values[i] == nullptr || values[i]->get() == nullptr) {
+            data[keys[i]] = core->CreateMValueNil();
+        } else {
+            data[keys[i]] = values[i]->get()->Clone();
+        }
     }
 
     auto virtualEntity = core->CreateVirtualEntity(group, pos, streamingDistance, data);

diff --git a/c-api/entities/baseObject.cpp b/c-api/entities/baseObject.cpp
@@ -62,6 +62,7 @@ void BaseObject_SetMultipleMetaData(alt::IBaseObject* baseObject, const char* ke
     std::unordered_map<std::string, alt::MValue> data = {};
 
     for (uint64_t i = 0; i < size; i++) {
+        if (values[i]->get() == nullptr) continue;
         data[keys[i]] = values[i]->get()->Clone();
     }
 
@@ -81,6 +82,7 @@ void BaseObject_SetMultipleSyncedMetaData(alt::IBaseObject* baseObject, const ch
     std::unordered_map<std::string, alt::MValue> data = {};
 
     for (uint64_t i = 0; i < size; i++) {
+        if (values[i]->get() == nullptr) continue;
         data[keys[i]] = values[i]->get()->Clone();
     }
 

diff --git a/c-api/entities/checkpoint.cpp b/c-api/entities/checkpoint.cpp
@@ -135,6 +135,7 @@ void Checkpoint_SetMultipleStreamSyncedMetaData(alt::ICheckpoint* checkpoint, co
     std::unordered_map<std::string, alt::MValue> data = {};
 
     for (uint64_t i = 0; i < size; i++) {
+        if (values[i]->get() == nullptr) continue;
         data[keys[i]] = values[i]->get()->Clone();
     }
 

diff --git a/c-api/entities/entity.cpp b/c-api/entities/entity.cpp
@@ -134,6 +134,7 @@ void Entity_SetMultipleStreamSyncedMetaData(alt::IEntity* entity, const char* ke
     std::unordered_map<std::string, alt::MValue> data = {};
 
     for (uint64_t i = 0; i < size; i++) {
+        if (values[i]->get() == nullptr) continue;
         data[keys[i]] = values[i]->get()->Clone();
     }
 

diff --git a/c-api/entities/virtual_entity.cpp b/c-api/entities/virtual_entity.cpp
@@ -73,6 +73,7 @@ void VirtualEntity_SetMultipleStreamSyncedMetaData(alt::IVirtualEntity* virtualE
     std::unordered_map<std::string, alt::MValue> data = {};
 
     for (uint64_t i = 0; i < size; i++) {
+        if (values[i]->get() == nullptr) continue;
         data[keys[i]] = values[i]->get()->Clone();
     }