ObjDefManager: Set replacement object's handle info after calling set()

Make gamedef optional when constructing an ObjDefManager
Add note about object ownership

1 files changed, 11 insertions, 2 deletions

diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index d8eb8068a..1de7fca81 100644
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -434,7 +434,7 @@ void GenerateNotifier::getEvents(
 ObjDefManager::ObjDefManager(IGameDef *gamedef, ObjDefType type)
 {
 	m_objtype = type;
-	m_ndef = gamedef->getNodeDefManager();
+	m_ndef = gamedef ? gamedef->getNodeDefManager() : NULL;
 }
 
 
@@ -471,7 +471,16 @@ ObjDef *ObjDefManager::get(ObjDefHandle handle) const
 ObjDef *ObjDefManager::set(ObjDefHandle handle, ObjDef *obj)
 {
 	u32 index = validateHandle(handle);
-	return (index != OBJDEF_INVALID_INDEX) ? setRaw(index, obj) : NULL;
+	if (index == OBJDEF_INVALID_INDEX)
+		return NULL;
+
+	ObjDef *oldobj = setRaw(index, obj);
+
+	obj->uid    = oldobj->uid;
+	obj->index  = oldobj->index;
+	obj->handle = oldobj->handle;
+
+	return oldobj;
 }