Fixed: Get out of the battle or war, should remove combo points