Generic NodeMetadata text input

[oweals/minetest.git] / src / content_sao.cpp

diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index eeb17bd3090975e5ced882359c144dad7f768275..1096ac116ecbc410a5d3bf5e5c7f709f932ac0ac 100644 (file)
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -1568,12 +1568,13 @@ void LuaEntitySAO::addedToEnvironment(u16 id)
        ServerActiveObject::addedToEnvironment(id);
        
        // Create entity from name and state
-       m_registered = true;
        lua_State *L = m_env->getLua();
-       scriptapi_luaentity_add(L, id, m_init_name.c_str(), m_init_state.c_str());
+       m_registered = scriptapi_luaentity_add(L, id, m_init_name.c_str(), m_init_state.c_str());
        
-       // Get properties
-       scriptapi_luaentity_get_properties(L, m_id, m_prop);
+       if(m_registered){
+               // Get properties
+               scriptapi_luaentity_get_properties(L, m_id, m_prop);
+       }
 }
 
 ServerActiveObject* LuaEntitySAO::create(ServerEnvironment *env, v3f pos,