Fix to partial trapping moves: new duration new damage on switch