Remove block metadata

diff --git a/src/client/client_commands.c b/src/client/client_commands.c
index ad253cfe7cda2d1560b833c2832e89e409c9e0cd..32f2cdc1fd2ab476369b55a580c65340990ca6f9 100644 (file)
--- a/src/client/client_commands.c
+++ b/src/client/client_commands.c
@@ -57,8 +57,6 @@ static bool block_handler(Client *client, bool good)
        else
                block = map_allocate_block(pos);
 
-       map_clear_meta(block);
-
        bool ret = map_deserialize_block(block, data, size);
 
        if (good)

diff --git a/src/map.c b/src/map.c
index 82af06420cc34a96f334f3fda261334fa70daf33..8bd7268e3ed3c247600e60e8320e154fd2fa19f7 100644 (file)
--- a/src/map.c
+++ b/src/map.c
@@ -133,16 +133,8 @@ MapBlock *map_allocate_block(v3s32 pos)
        return block;
 }
 
-void map_clear_meta(MapBlock *block)
-{
-       pthread_mutex_lock(&block->mtx);
-       ITERATE_MAPBLOCK list_clear(&block->metadata[x][y][z]);
-       pthread_mutex_unlock(&block->mtx);
-}
-
 void map_free_block(MapBlock *block)
 {
-       map_clear_meta(block);
        pthread_mutex_destroy(&block->mtx);
        free(block);
 }
@@ -196,7 +188,6 @@ bool map_deserialize_block(MapBlock *block, const char *data, size_t size)
                        node_definitions[node.type].deserialize(&node);
 
                block->data[x][y][z] = node;
-               block->metadata[x][y][z] = list_create(&list_compare_string);
        }
 
        return true;
@@ -228,7 +219,6 @@ void map_set_node(Map *map, v3s32 pos, MapNode node, bool create, void *arg)
                if (! map->callbacks.set_node || map->callbacks.set_node(block, offset, &node, arg)) {
                        if (map->callbacks.after_set_node)
                                map->callbacks.after_set_node(block, offset, arg);
-                       list_clear(&block->metadata[offset.x][offset.y][offset.z]);
                        block->data[offset.x][offset.y][offset.z] = node;
                }
                pthread_mutex_unlock(&block->mtx);

diff --git a/src/map.h b/src/map.h
index 2cb3613a0f815fee36d7c3f4d7bc3b4dbcfd1afe..e7b4ad10d6da8751dbb60013f16ff53dbed621dd 100644 (file)
--- a/src/map.h
+++ b/src/map.h
@@ -22,7 +22,6 @@ typedef MapNode MapBlockData[MAPBLOCK_SIZE][MAPBLOCK_SIZE][MAPBLOCK_SIZE];
 typedef struct
 {
        MapBlockData data;
-       List metadata[MAPBLOCK_SIZE][MAPBLOCK_SIZE][MAPBLOCK_SIZE];
        v3s32 pos;
        pthread_mutex_t mtx;
        void *extra;
@@ -60,7 +59,6 @@ MapSector *map_get_sector(Map *map, v2s32 pos, bool create);
 MapBlock *map_get_block(Map *map, v3s32 pos, bool create);
 
 MapBlock *map_allocate_block(v3s32 pos);
-void map_clear_meta(MapBlock *block);
 void map_free_block(MapBlock *block);
 
 bool map_deserialize_node(int fd, MapNode *buf);

diff --git a/src/server/server_map.c b/src/server/server_map.c
index f9b65214164eef35bb7a617fe2e66a58b721d156..15c5f0c1fade8ca2e03dff8d6a9df6f7dba39db7 100644 (file)
--- a/src/server/server_map.c
+++ b/src/server/server_map.c
@@ -121,7 +121,6 @@ static void on_create_block(MapBlock *block)
 
                ITERATE_MAPBLOCK {
                        block->data[x][y][z] = map_node_create(NODE_AIR);
-                       block->metadata[x][y][z] = list_create(&list_compare_string);
                        extra->mgs_buffer[x][y][z] = MGS_VOID;
                }
        }