fixed deadlock and #include error

Author: programmerjake

src/world/view_point.cpp

@@ -355,6 +355,7 @@ void ViewPoint::render(Renderer &renderer, Matrix worldToCamera, WorldLockManage
             for(chunkPosition.z = minChunkPosition.z; chunkPosition.z <= maxChunkPosition.z; chunkPosition.z += BlockChunk::chunkSizeZ)
             {
                 BlockIterator cbi = world.getBlockIterator(chunkPosition);
+                lock_manager.clear();
                 std::unique_lock<std::recursive_mutex> lockChunk(cbi.chunk->chunkVariables.entityListLock);
                 for(WrappedEntity &entity : cbi.chunk->chunkVariables.entityList)
                 {

src/world/world.cpp

@@ -42,7 +42,7 @@
 #include "generate/decorator.h"
 #include "util/decorator_cache.h"
 #include "util/wood_descriptor.h"
-#include "item/builtin/tools/stone_toolset.h"
+#include "item/builtin/tools/mineral_toolsets.h"
 #include "item/builtin/minerals.h"
 #include "item/builtin/ores.h"
 #include "item/builtin/cobblestone.h"