Fix FUNC template when create via ingame command

Sphereserver · Dec 11, 2023 · 81b8d3b · 81b8d3b
1 parent 56f6e6c
commit 81b8d3b
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/src/game/items/CItem.cpp b/src/game/items/CItem.cpp
@@ -645,9 +645,18 @@ CItem * CItem::ReadTemplate( CResourceLock & s, CObjBase * pCont ) // static
 						pScriptArgs = std::make_unique<CScriptTriggerArgs>(ptcArgs);
 					}
 
-					CObjBaseTemplate* pContObjBaseT = pCont->GetTopLevelObj();
-					ASSERT(pContObjBaseT);
-					pItem->r_Call(ptcFunctionName, dynamic_cast<CTextConsole*>(pContObjBaseT), pScriptArgs.get());
+					// use pCont is exist, if not use g_Serv
+					if (pCont)
+					{
+						CObjBaseTemplate* pContObjBaseT = pCont->GetTopLevelObj();
+						ASSERT(pContObjBaseT);
+						pItem->r_Call(ptcFunctionName, dynamic_cast<CTextConsole*>(pContObjBaseT), pScriptArgs.get());
+					}
+					else
+					{
+						pItem->r_Call(ptcFunctionName, &g_Serv, pScriptArgs.get());
+					}
+
 					if (pItem->IsDeleted())
 					{
 						pItem = nullptr;