Update minetest.conf.example and settings_translation_file.cpp (#8278)

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

diff --git a/src/serverobject.cpp b/src/serverobject.cpp
index 191247829304b48cd0bbb126a61c4d6b74f5902a..4eebc0da4e21554cff5f7d2b9434964a3aa96103 100644 (file)
--- a/src/serverobject.cpp
+++ b/src/serverobject.cpp
@@ -21,23 +21,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <fstream>
 #include "inventory.h"
 #include "constants.h" // BS
+#include "log.h"
 
 ServerActiveObject::ServerActiveObject(ServerEnvironment *env, v3f pos):
        ActiveObject(0),
-       m_known_by_count(0),
-       m_removed(false),
-       m_pending_deactivation(false),
-       m_static_exists(false),
-       m_static_block(1337,1337,1337),
        m_env(env),
        m_base_position(pos)
 {
 }
 
-ServerActiveObject::~ServerActiveObject()
-{
-}
-
 ServerActiveObject* ServerActiveObject::create(ActiveObjectType type,
                ServerEnvironment *env, u16 id, v3f pos,
                const std::string &data)
@@ -82,7 +74,7 @@ ItemStack ServerActiveObject::getWieldedItem() const
        if(inv)
        {
                const InventoryList *list = inv->getList(getWieldList());
-               if(list && (getWieldIndex() < (s32)list->getSize())) 
+               if(list && (getWieldIndex() < (s32)list->getSize()))
                        return list->getItem(getWieldIndex());
        }
        return ItemStack();