Optimize entity-entity collision (#6587)