Generate spawn hut

[dragonblocks_alpha.git] / src / map.c

diff --git a/src/map.c b/src/map.c
index 29892107f78168a9708cdd15dc57b665b1b47216..5da5acd8d58b8a1e3d535cd4aa7b8ca6faebcb61 100644 (file)
--- a/src/map.c
+++ b/src/map.c
@@ -2,7 +2,7 @@
 #include <stdbool.h>
 #include <unistd.h>
 #include <math.h>
-#include <endian.h>
+#include <endian.h/endian.h>
 #include <string.h>
 #include "map.h"
 #include "util.h"
@@ -147,7 +147,7 @@ bool map_deserialize_node(int fd, MapNode *node)
                return false;
 
        if (type >= NODE_UNLOADED)
-               type = NODE_INVALID;
+               type = NODE_UNKNOWN;
 
        *node = map_node_create(type);
 
@@ -182,7 +182,7 @@ bool map_deserialize_block(MapBlock *block, const char *data, size_t size)
                node.type = be32toh(node.type);
 
                if (node.type >= NODE_UNLOADED)
-                       node.type = NODE_INVALID;
+                       node.type = NODE_UNKNOWN;
 
                if (node_definitions[node.type].deserialize)
                        node_definitions[node.type].deserialize(&node);
@@ -217,9 +217,9 @@ void map_set_node(Map *map, v3s32 pos, MapNode node, bool create, void *arg)
        if (block) {
                pthread_mutex_lock(&block->mtx);
                if (! map->callbacks.set_node || map->callbacks.set_node(block, offset, &node, arg)) {
+                       block->data[offset.x][offset.y][offset.z] = node;
                        if (map->callbacks.after_set_node)
                                map->callbacks.after_set_node(block, offset, arg);
-                       block->data[offset.x][offset.y][offset.z] = node;
                }
                pthread_mutex_unlock(&block->mtx);
        }