Fix unit test if there isn't a localhost address (for example FreeBSD jails), second...

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

diff --git a/src/nodedef.cpp b/src/nodedef.cpp
index f01a7e87b03b46e2a71f23c817f6e7e616cb3b07..bcf51a072e1429e9f75d8c93b6e1e1786564fa6b 100644 (file)
--- a/src/nodedef.cpp
+++ b/src/nodedef.cpp
@@ -227,7 +227,6 @@ void ContentFeatures::reset()
        liquid_alternative_source = "";
        liquid_viscosity = 0;
        liquid_renewable = true;
-       freezemelt = "";
        liquid_range = LIQUID_LEVEL_MAX+1;
        drowning = 0;
        light_source = 0;
@@ -403,6 +402,9 @@ public:
        void serialize(std::ostream &os, u16 protocol_version);
        void deSerialize(std::istream &is);
 
+       inline virtual bool getNodeRegistrationStatus() const;
+       inline virtual void setNodeRegistrationStatus(bool completed);
+
        virtual void pendNodeResolve(NodeResolveInfo *nri);
        virtual void cancelNodeResolve(NodeResolver *resolver);
        virtual void runNodeResolverCallbacks();
@@ -442,6 +444,9 @@ private:
 
        // List of node strings and node resolver callbacks to perform
        std::list<NodeResolveInfo *> m_pending_node_lookups;
+
+       // True when all nodes have been registered
+       bool m_node_registration_complete;
 };
 
 
@@ -473,6 +478,14 @@ void CNodeDefManager::clear()
        m_group_to_items.clear();
        m_next_id = 0;
 
+       m_node_registration_complete = false;
+       for (std::list<NodeResolveInfo *>::iterator
+                       it = m_pending_node_lookups.begin();
+                       it != m_pending_node_lookups.end();
+                       ++it)
+               delete *it;
+       m_pending_node_lookups.clear();
+
        u32 initial_length = 0;
        initial_length = MYMAX(initial_length, CONTENT_UNKNOWN + 1);
        initial_length = MYMAX(initial_length, CONTENT_AIR + 1);
@@ -1269,10 +1282,28 @@ void ContentFeatures::deSerializeOld(std::istream &is, int version)
 }
 
 
+inline bool CNodeDefManager::getNodeRegistrationStatus() const
+{
+       return m_node_registration_complete;
+}
+
+
+inline void CNodeDefManager::setNodeRegistrationStatus(bool completed)
+{
+       m_node_registration_complete = completed;
+}
+
+
 void CNodeDefManager::pendNodeResolve(NodeResolveInfo *nri)
 {
        nri->resolver->m_ndef = this;
-       m_pending_node_lookups.push_back(nri);
+       if (m_node_registration_complete) {
+               nri->resolver->resolveNodeNames(nri);
+               nri->resolver->m_lookup_done = true;
+               delete nri;
+       } else {
+               m_pending_node_lookups.push_back(nri);
+       }
 }