User blog:Lassan/LUFFY vs SHIKI

When did luffy fought with shiki, is it after or before the marinford war.