20271: Fixes bugs when storing entities with many contained entities (#…

…130)
howsoai · May 10, 2024 · b74690d · b74690d
1 parent f649820
commit b74690d
Showing 1 changed file with 21 additions and 1 deletion.
diff --git a/src/Amalgam/entity/Entity.h b/src/Amalgam/entity/Entity.h
@@ -484,9 +484,29 @@ class Entity
 			: bufferReference(&buffer)
 		{ }
 
+		inline EntityReferenceBufferReference(EntityReferenceBufferReference &&erbr)
+		{
+			bufferReference = erbr.bufferReference;
+			erbr.bufferReference = nullptr;
+		}
+
 		inline ~EntityReferenceBufferReference()
 		{
-			bufferReference->clear();
+			if(bufferReference != nullptr)
+				bufferReference->clear();
+		}
+
+		inline EntityReferenceBufferReference &operator=(EntityReferenceBufferReference &&erbr)
+		{
+			if(this != &erbr)
+			{
+				if(bufferReference != nullptr)
+					bufferReference->clear();
+
+				bufferReference = erbr.bufferReference;
+				erbr.bufferReference = nullptr;
+			}
+			return *this;
 		}
 
 		constexpr operator std::vector<EntityReferenceType> *()