Fix merge conflicts
This commit is contained in:
parent
327b70e769
commit
8301f479bb
@ -1384,13 +1384,6 @@ void cChunkMap::ReplaceTreeBlocks(const sSetBlockVector & a_Blocks)
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case E_BLOCK_NEW_LEAVES:
|
|
||||||
{
|
|
||||||
if (itr->BlockType == E_BLOCK_NEW_LOG)
|
|
||||||
{
|
|
||||||
Chunk->SetBlock(itr->x, itr->y, itr->z, itr->BlockType, itr->BlockMeta);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
} // for itr - a_Blocks[]
|
} // for itr - a_Blocks[]
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user