ServerEnv: Clean up object lifecycle handling (#6414)

* ServerEnv: Clean up object lifecycle handling
2017-09-15 12:19:01 +02:00
parent 5b2461c713
commit c2a0333901
9 changed files with 185 additions and 224 deletions
--- a/src/serverobject.cpp
+++ b/src/serverobject.cpp
@@ -25,7 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 ServerActiveObject::ServerActiveObject(ServerEnvironment *env, v3f pos):
 	ActiveObject(0),
 	m_known_by_count(0),
-	m_removed(false),
+	m_pending_removal(false),
 	m_pending_deactivation(false),
 	m_static_exists(false),
 	m_static_block(1337,1337,1337),